[Ltib] mux_server.c / mux_server-1.0-fs-decl.patch / reject file

[Franz Trierweiler]

Good morning,

I resend since this message does not seem to have been properly displayed in the latest LTIB digest.

LTIB patches mux_server.c with mux_server-1.0-fs-decl.patch. On my machine, patch command creates a rej file:

***************
*** 648,659 ****
      struct sockaddr_in sockaddr;
      struct iochan *c;
      int num_bind_retries = 0;
      int rc;
 
      if (verbose)
          printf("tcp_listen_channel %d %d\n",port,stream_id);
 
-     int fd  = socket(PF_INET, SOCK_STREAM, 0);
      if (fd < 0) {
          fatal("socket() failed for stream %d", stream_id);
      }
--- 648,660 ----
      struct sockaddr_in sockaddr;
      struct iochan *c;
      int num_bind_retries = 0;
+     int fd;
      int rc;
 
      if (verbose)
          printf("tcp_listen_channel %d %d\n",port,stream_id);
 
+     fd  = socket(PF_INET, SOCK_STREAM, 0);
      if (fd < 0) {
          fatal("socket() failed for stream %d", stream_id);
      }

I read man pages on "diff" and "patch" so that I can understand now the underlying concepts of patch mechanisms. I understand what this patch file wants to modifiy but I do not understand what the rej file means. Where is the error?

For safety, I browsed http://www.zee2.com/gpp/ in order to make sure there is not another release. Indeed, I do work with the same patch version as the one on http://www.zee2.com/gpp/.

Thanks for your help.

Franz