Remove explicit error output

mfragkoulis · Jan 17, 2017 · ad69404 · ad69404
1 parent eb20db8
commit ad69404
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/src/comm.c b/src/comm.c
@@ -283,7 +283,6 @@ compare_files (int nfiles, char **infiles)
   int ninputfds = 2 - nfiles;
   int *inputfds;
   int *outputfds;
-  int status = -1;
 
   /* dgsh 
   if (STREQ(infiles[0], "-"))
@@ -292,12 +291,9 @@ compare_files (int nfiles, char **infiles)
     ninputfds++;
   */
 
-  if ((status = dgsh_negotiate(negotiation_title, &ninputfds, &noutputfds,
-				  &inputfds, &outputfds)))
-    {
-      DPRINTF("dgsh negotiation failed with status code %d.\n", status);
+  if (dgsh_negotiate(negotiation_title, &ninputfds, &noutputfds,
+				  &inputfds, &outputfds) != 0)
       exit(1);
-    }
 
   /* The first file descriptor has been set to stdin */
   if (ninputfds > 0)

diff --git a/src/join.c b/src/join.c
@@ -1219,13 +1219,9 @@ main (int argc, char **argv)
   else
     snprintf(negotiation_title, 100, "%s", argv[0]);
 
-  int exit_status;
-  if ((exit_status = dgsh_negotiate(negotiation_title,
-				  &ninputfds, NULL, &inputfds, NULL)) != 0)
-    {
-      DPRINTF("dgsh negotiation failed with status code %d.\n", exit_status);
+  if (dgsh_negotiate(negotiation_title,
+				  &ninputfds, NULL, &inputfds, NULL) != 0)
       exit(1);
-    }
 
   fp1 = STREQ (g_names[0], "-") ? stdin : fopen (g_names[0], "r");
   if (!fp1)

diff --git a/src/paste.c b/src/paste.c
@@ -382,17 +382,13 @@ paste_serial (size_t nfiles, char **fnamptr)
   FILE *fileptr;	/* Open for reading current file. */
 
   /* dgsh */
-  int status = -1;
   int j = 0;
   int ninputfds = -1;
   int *inputfds;
 
-  if ((status = dgsh_negotiate("paste", &ninputfds, NULL,
-				  &inputfds, NULL)) != 0)
-  {
-    DPRINTF("dgsh negotiation failed with status code %d.\n", status);
+  if (dgsh_negotiate("paste", &ninputfds, NULL,
+				  &inputfds, NULL) != 0)
     exit(1);
-  }
 
   for (; nfiles; nfiles--, fnamptr++)
     {

diff --git a/src/sort.c b/src/sort.c
@@ -3894,20 +3894,16 @@ sort (char ***files, size_t nfiles, char const *output_file,
   int j = 0;
   int ninputfds = 0;
   int *inputfds;
-  int status = -1;
   int count_stdin_files = 0;
 
   buf.alloc = 0;
 
   if (nfiles == 1 && STREQ((*files)[0], "-"))
     ninputfds = -1;
 
-  if ((status = dgsh_negotiate(negotiation_title,
-				  &ninputfds, NULL, &inputfds, NULL)) != 0)
-    {
-    DPRINTF("dgsh negotiation failed with status code %d.\n", status);
+  if (dgsh_negotiate(negotiation_title,
+				  &ninputfds, NULL, &inputfds, NULL) != 0)
     exit(1);
-    }
 
   /* Count stdin input file directives */
   for (j = 0; j < nfiles; j++)