removed /* MUNGED */ comments

hanslub42 · May 18, 2014 · 39a1c2b · 39a1c2b
1 parent ac75ddf
commit 39a1c2b
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 12 deletions.
diff --git a/src/completion.c b/src/completion.c
@@ -1483,7 +1483,6 @@ feed_file_into_completion_list(const char *completions_file)
 
   if ((compl_fp = fopen(completions_file, "r")) == NULL)
     myerror(FATAL|USE_ERRNO, "Could not open %s", completions_file);
-  /* @@@ MUNGED! */
   while (fgets(buffer, BUFFSIZE - 1, compl_fp) != NULL) {
     buffer[BUFFSIZE - 1] = '\0';	/* make sure buffer is properly terminated (it should be anyway, according to ANSI) */
     feed_line_into_completion_list(buffer);

diff --git a/src/completion.rb b/src/completion.rb
@@ -150,7 +150,6 @@
 
   if ((compl_fp = fopen(completions_file, "r")) == NULL)
     myerror(FATAL|USE_ERRNO, "Could not open %s", completions_file);
-  /* @@@ MUNGED! */
   while (fgets(buffer, BUFFSIZE - 1, compl_fp) != NULL) {
     buffer[BUFFSIZE - 1] = '\0';	/* make sure buffer is properly terminated (it should be anyway, according to ANSI) */
     feed_line_into_completion_list(buffer);

diff --git a/src/filter.c b/src/filter.c
@@ -157,7 +157,7 @@ void kill_filter()  {
   if(!filter_is_dead &&                     /* filter's SIGCHLD hasn't been caught  */
      waitpid(filter_pid, &status, WNOHANG) < 0 && /* interrupted  .. */
      WTERMSIG(status) == SIGALRM) {         /*  .. by alarm (and not e.g. by SIGCHLD) */
-    /* @@@ MUNGED! */ myerror(WARNING|NOERRNO, "filter didn't die - killing it now");
+     myerror(WARNING|NOERRNO, "filter didn't die - killing it now");
   }
   if (filter_pid)
     kill(filter_pid, SIGKILL); /* do this as a last resort */
@@ -224,7 +224,7 @@ void handle_out_of_band(int tag, char *message) {
   case TAG_ERROR:
     if (expected_tag == TAG_COMPLETION) /* start new line when completing (looks better) */
       fprintf(stderr, "\n"); /* @@@ error reporting (still) uses bufered I/O */
-    /* @@@ MUNGED! */ myerror(FATAL|NOERRNO, message);
+      myerror(FATAL|NOERRNO, message);
   case TAG_OUTPUT_OUT_OF_BAND:
     my_putstr(message);
     break;

diff --git a/src/main.c b/src/main.c
@@ -752,9 +752,7 @@ read_options_and_command_name(int argc, char **argv)
       else
         debug = DEBUG_DEFAULT;
 #else
-     /* @@@ MUNGED! */ 
-     myerror
-        ("To use -d( for debugging), configure %s with --enable-debug and rebuild",
+     myerror(FATAL|NOERRNO, "To use -d( for debugging), configure %s with --enable-debug and rebuild",
          program_name);
 #endif
       break;

diff --git a/src/pty.c b/src/pty.c
@@ -360,7 +360,7 @@ int dont_wrap_command_waits() {
   wchan_fd =  open(command_wchan, O_RDONLY);
   if (wchan_fd < 0) { 
     if (been_warned++ == 0) {
-      myerror(WARNING|USE_ERRNO, "you probably specified the -N (-no-children) option"
+      myerror(WARNING|USE_ERRNO, "you probably specified the -N (--no-children) option"
                                  " - but spying\non %s's wait status does not work on"
                                  " your system, as we cannot read %s", command_name, command_wchan);
     }

diff --git a/src/ptytty.c b/src/ptytty.c
@@ -250,7 +250,7 @@ ptytty_control_tty(int fd_tty, const char *ttydev)
              fd < 0 ? "no (good)" : "yes (bad)");
     if (fd >= 0)
       close(fd);                  /* ouch: still have controlling tty */
-    /* @@@ MUNGED! */
+
     /* ---------------------------------------- */
 #if defined(PTYS_ARE_PTMX) && defined(I_PUSH)
     /*

diff --git a/src/readline.c b/src/readline.c
@@ -514,7 +514,7 @@ munge_line_in_editor(int count, int key)
   DPRINTF1(DEBUG_READLINE, "calling %s", editor_command4);
   if ((ret = system(editor_command4))) {
     if (WIFSIGNALED(ret)) {
-      fprintf(stderr, "\n"); /* @@@ MUNGED! */
+      fprintf(stderr, "\n"); 
       myerror(FATAL|NOERRNO, "editor killed by signal");
     } else {    
       myerror(FATAL|USE_ERRNO, "failed to invoke editor with '%s'", editor_command4);

diff --git a/src/signals.c b/src/signals.c
@@ -417,8 +417,7 @@ void suicide_by(int signal, int status) {
      the shell may tell the user that rlwrap itself has failed. Make clear that
      it didn't. @@@ We could also try argv[0] = command_name just before dying ? */
 
-  if (signals_program_error(signal)) { 
-    /* @@@ MUNGED! */  
+  if (signals_program_error(signal)) {  
     myerror(WARNING|NOERRNO, "%s crashed, killed by %s%s.\n%s itself has not crashed, but for transparency,\n"
            "it will now kill itself %swith the same signal\n",
            command_name, signal_name(signal), (coredump(status) ? " (core dumped)" : ""),