/[cvs]/ccvs/src/buffer.c
ViewVC logotype

Diff of /ccvs/src/buffer.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.64 by dprice, Thu Sep 29 04:42:48 2005 UTC revision 1.65 by mdb, Wed Dec 7 09:17:20 2005 UTC
# Line 2118  fd_buffer_shutdown (struct buffer *buf) Line 2118  fd_buffer_shutdown (struct buffer *buf)
2118           */           */
2119          else if (fb->root && pclose (fb->fd) == EOF)          else if (fb->root && pclose (fb->fd) == EOF)
2120          {          {
2121              error (1, errno, "closing connection to %s",              error (0, errno, "closing connection to %s",
2122                     fb->root->hostname);                     fb->root->hostname);
2123              closefd = false;              closefd = false;
2124          }          }
# Line 2158  fd_buffer_shutdown (struct buffer *buf) Line 2158  fd_buffer_shutdown (struct buffer *buf)
2158              /* Syslog this? */              /* Syslog this? */
2159          }          }
2160  # ifdef CLIENT_SUPPORT  # ifdef CLIENT_SUPPORT
2161            /* We are already closing the connection.
2162             * On error, print a warning and try to
2163             * continue to avoid infinte loops.
2164             */
2165          else if (fb->root)          else if (fb->root)
2166              error (1, errno, "closing down connection to %s",              error (0, errno, "closing down connection to %s",
2167                     fb->root->hostname);                     fb->root->hostname);
             /* EXITS */  
2168  # endif /* CLIENT_SUPPORT */  # endif /* CLIENT_SUPPORT */
2169            else
2170          error (0, errno, "closing down buffer");              error (0, errno, "closing down buffer");
2171      }      }
2172    
2173      /* If we were talking to a process, make sure it exited */      /* If we were talking to a process, make sure it exited */
# Line 2175  fd_buffer_shutdown (struct buffer *buf) Line 2178  fd_buffer_shutdown (struct buffer *buf)
2178          do          do
2179              w = waitpid (fb->child_pid, NULL, 0);              w = waitpid (fb->child_pid, NULL, 0);
2180          while (w == -1 && errno == EINTR);          while (w == -1 && errno == EINTR);
2181    
2182            /* We are already closing the connection.
2183             * On error, print a warning and try to
2184             * continue to avoid infinte loops.
2185             */
2186          if (w == -1)          if (w == -1)
2187              error (1, errno, "waiting for process %d", fb->child_pid);              error (0, errno, "waiting for process %d", fb->child_pid);
2188      }      }
2189    
2190      free (buf->closure);      free (buf->closure);

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.65

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26