diff -N -c -r -X exclude_files squid-1.0.beta9/src/icp.c squid-1.0.beta9.henrik/src/icp.c
*** squid-1.0.beta9/src/icp.c	Fri May 24 06:38:30 1996
--- squid-1.0.beta9.henrik/src/icp.c	Fri May 24 08:16:57 1996
***************
*** 125,131 ****
  
  
  /* This is a handler normally called by comm_close() */
! int icpStateFree(fd, icpState)
       int fd;
       icpStateData *icpState;
  {
--- 125,131 ----
  
  
  /* This is a handler normally called by comm_close() */
! static int icpStateFree(fd, icpState)
       int fd;
       icpStateData *icpState;
  {
***************
*** 185,191 ****
  	BIT_SET(icpState->flags, REQ_AUTH);
  }
  
! int icpCachable(icpState)
       icpStateData *icpState;
  {
      char *request = icpState->url;
--- 186,192 ----
  	BIT_SET(icpState->flags, REQ_AUTH);
  }
  
! static int icpCachable(icpState)
       icpStateData *icpState;
  {
      char *request = icpState->url;
***************
*** 209,215 ****
  }
  
  /* Return true if we can query our neighbors for this object */
! int icpHierarchical(icpState)
       icpStateData *icpState;
  {
      char *request = icpState->url;
--- 210,216 ----
  }
  
  /* Return true if we can query our neighbors for this object */
! static int icpHierarchical(icpState)
       icpStateData *icpState;
  {
      char *request = icpState->url;
***************
*** 240,246 ****
  }
  
  /* Read from FD. */
! int icpHandleRead(fd, icpRWState)
       int fd;
       icpRWStateData *icpRWState;
  {
--- 241,247 ----
  }
  
  /* Read from FD. */
! static int icpHandleRead(fd, icpRWState)
       int fd;
       icpRWStateData *icpRWState;
  {
***************
*** 326,332 ****
  }
  
  /* Write to FD. */
! void icpHandleWrite(fd, icpRWState)
       int fd;
       icpRWStateData *icpRWState;
  {
--- 327,333 ----
  }
  
  /* Write to FD. */
! static void icpHandleWrite(fd, icpRWState)
       int fd;
       icpRWStateData *icpRWState;
  {
***************
*** 427,451 ****
      return ((char *) data);
  }
  
! void icpSendERRORComplete(fd, buf, size, errflag, icpState)
       int fd;
       char *buf;
       int size;
       int errflag;
       icpStateData *icpState;
  {
      StoreEntry *entry = NULL;
      debug(12, 4, "icpSendERRORComplete: FD %d: sz %d: err %d.\n",
  	fd, size, errflag);
  
      /* Clean up client side statemachine */
      entry = icpState->entry;
      icpFreeBufOrPage(icpState);
      comm_close(fd);
  }
  
  /* Send ERROR message. */
! int icpSendERROR(fd, errorCode, msg, icpState)
       int fd;
       int errorCode;
       char *msg;
--- 429,453 ----
      return ((char *) data);
  }
  
! static void icpSendERRORComplete(fd, buf, size, errflag, icpState)
       int fd;
       char *buf;
       int size;
       int errflag;
       icpStateData *icpState;
  {
      StoreEntry *entry = NULL;
      debug(12, 4, "icpSendERRORComplete: FD %d: sz %d: err %d.\n",
  	fd, size, errflag);
  
      /* Clean up client side statemachine */
      entry = icpState->entry;
      icpFreeBufOrPage(icpState);
      comm_close(fd);
  }
  
  /* Send ERROR message. */
! static int icpSendERROR(fd, errorCode, msg, icpState)
       int fd;
       int errorCode;
       char *msg;
***************
*** 485,491 ****
  /* Send available data from an object in the cache.  This is called either
   * on select for  write or directly by icpHandleStore. */
  
! int icpSendMoreData(fd, icpState)
       int fd;
       icpStateData *icpState;
  {
--- 484,490 ----
  /* Send available data from an object in the cache.  This is called either
   * on select for  write or directly by icpHandleStore. */
  
! static int icpSendMoreData(fd, icpState)
       int fd;
       icpStateData *icpState;
  {
***************
*** 658,664 ****
      IMS_hdr=mime_get_header(icpState->request_hdr,"If-Modified-Since");
      httpParseHeaders(buf, entry->mem_obj->reply);
  
!     /* Buf is no longer needed */
      icpFreeBufOrPage(icpState);
      
      if(!IMS_hdr) {
--- 657,663 ----
      IMS_hdr=mime_get_header(icpState->request_hdr,"If-Modified-Since");
      httpParseHeaders(buf, entry->mem_obj->reply);
  
!     /* Headers is no longer needed (they are parsed) */
      icpFreeBufOrPage(icpState);
      
      if(!IMS_hdr) {
***************
*** 762,768 ****
   * Below, we check whether the object is a hit or a miss.  If it's a hit,
   * we check whether the object is still valid or whether it is a MISS_TTL.
   */
! void icp_hit_or_miss(fd, icpState)
       int fd;
       icpStateData *icpState;
  {
--- 761,767 ----
   * Below, we check whether the object is a hit or a miss.  If it's a hit,
   * we check whether the object is still valid or whether it is a MISS_TTL.
   */
! static void icp_hit_or_miss(fd, icpState)
       int fd;
       icpStateData *icpState;
  {
***************
*** 1420,1426 ****
   *    0 on incomplete request
   *    1 on success
   */
! int parseHttpRequest(icpState)
       icpStateData *icpState;
  {
      char *inbuf = NULL;
--- 1419,1425 ----
   *    0 on incomplete request
   *    1 on success
   */
! static int parseHttpRequest(icpState)
       icpStateData *icpState;
  {
      char *inbuf = NULL;
***************
*** 1603,1609 ****
   *   icp_hit_or_miss()
   *   icpSendERROR()
   */
! void asciiProcessInput(fd, buf, size, flag, icpState)
       int fd;
       char *buf;
       int size;
--- 1602,1608 ----
   *   icp_hit_or_miss()
   *   icpSendERROR()
   */
! static void asciiProcessInput(fd, buf, size, flag, icpState)
       int fd;
       char *buf;
       int size;
***************
*** 1731,1737 ****
  
  
  /* general lifetime handler for ascii connection */
! void asciiConnLifetimeHandle(fd, data)
       int fd;
       void *data;
  {
--- 1730,1736 ----
  
  
  /* general lifetime handler for ascii connection */
! static void asciiConnLifetimeHandle(fd, data)
       int fd;
       void *data;
  {