[naviserver-commits] naviserver/nsd unix.c,1.6,1.7

[Zoran V. <vas...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32049

Modified Files:
	unix.c 
Log Message:
Cosmetic cleanup (reformat some function comments, untabified)


Index: unix.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/unix.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** unix.c	15 May 2005 07:47:21 -0000	1.6
--- unix.c	10 Jun 2005 07:03:27 -0000	1.7
***************
*** 63,73 ****
   * NsBlockSignals --
   *
!  *  Block signals at startup.
   *
   * Results:
!  *  None.
   *
   * Side effects:
!  *  Signals will be pending until NsHandleSignals.
   *
   *----------------------------------------------------------------------
--- 63,73 ----
   * NsBlockSignals --
   *
!  *      Block signals at startup.
   *
   * Results:
!  *      None.
   *
   * Side effects:
!  *      Signals will be pending until NsHandleSignals.
   *
   *----------------------------------------------------------------------
***************
*** 117,121 ****
   * NsRestoreSignals --
   *
!  *  Restore all signals to their default value.
   *
   * Results:
--- 117,121 ----
   * NsRestoreSignals --
   *
!  *      Restore all signals to their default value.
   *
   * Results:
***************
*** 123,127 ****
   *
   * Side effects:
!  *      A new thread will be created.
   *
   *----------------------------------------------------------------------
--- 123,127 ----
   *
   * Side effects:
!  *      None.
   *
   *----------------------------------------------------------------------
***************
*** 147,158 ****
   * NsHandleSignals --
   *
!  *  Loop forever processing signals until a term signal
   *      is received.
   *
   * Results:
!  *  None.
   *
   * Side effects:
!  *  HUP callbacks may be called.
   *
   *----------------------------------------------------------------------
--- 147,158 ----
   * NsHandleSignals --
   *
!  *      Loop forever processing signals until a term signal 
   *      is received.
   *
   * Results:
!  *      None.
   *
   * Side effects:
!  *      HUP callbacks may be called.
   *
   *----------------------------------------------------------------------
***************
*** 176,188 ****
      }
      do {
!     do {
!         err = ns_sigwait(&set, &sig);
!     } while (err == EINTR);
!     if (err != 0) {
!         Ns_Fatal("signal: ns_sigwait failed: %s", strerror(errno));
!     }
!     if (sig == SIGHUP) {
!         NsRunSignalProcs();
!     }
      } while (sig == SIGHUP);
  
--- 176,188 ----
      }
      do {
!         do {
!             err = ns_sigwait(&set, &sig);
!         } while (err == EINTR);
!         if (err != 0) {
!             Ns_Fatal("signal: ns_sigwait failed: %s", strerror(errno));
!         }
!         if (sig == SIGHUP) {
!             NsRunSignalProcs();
!         }
      } while (sig == SIGHUP);
  
***************
*** 202,212 ****
   * NsSendSignal --
   *
!  *  Send a signal to the main thread.
   *
   * Results:
!  *  None.
   *
   * Side effects:
!  *  Main thread in NsHandleSignals will wakeup.
   *
   *----------------------------------------------------------------------
--- 202,212 ----
   * NsSendSignal --
   *
!  *      Send a signal to the main thread.
   *
   * Results:
!  *      None.
   *
   * Side effects:
!  *      Main thread in NsHandleSignals will wakeup.
   *
   *----------------------------------------------------------------------
***************
*** 293,296 ****
--- 293,297 ----
      }
      Ns_MutexUnlock(&lock);
+ 
      return (pw != NULL) ? NS_TRUE : NS_FALSE;
  }
***************
*** 336,343 ****
   * Results:
   *      Return NS_TRUE if user name is found in /etc/passwd file and 
!  *  NS_FALSE otherwise.
   *
   * Side effects:
!  *  None.
   *
   *----------------------------------------------------------------------
--- 337,344 ----
   * Results:
   *      Return NS_TRUE if user name is found in /etc/passwd file and 
!  *      NS_FALSE otherwise.
   *
   * Side effects:
!  *      None.
   *
   *----------------------------------------------------------------------
***************
*** 367,371 ****
   *
   * Results:
!  *  Group id or -1 if not found.
   *
   * Side effects:
--- 368,372 ----
   *
   * Results:
!  *      Group id or -1 if not found.
   *
   * Side effects:
***************
*** 389,392 ****
--- 390,394 ----
      }
      Ns_MutexUnlock(&lock);
+ 
      return retcode;
  }
***************
*** 426,429 ****
--- 428,432 ----
  }
  
+ 
  /*
   *----------------------------------------------------------------------
***************
*** 433,437 ****
   *
   * Results:
!  *  Group id or -1 if not found.
   *
   * Side effects:
--- 436,440 ----
   *
   * Results:
!  *      Group id or -1 if not found.
   *
   * Side effects:
***************
*** 481,487 ****
--- 484,492 ----
      fd_set ifds, ofds, efds;
      int i, rc, n = -1;
+ 
      FD_ZERO(&ifds);
      FD_ZERO(&ofds);
      FD_ZERO(&efds);
+ 
      for (i = 0; i < nfds; ++i) {
          if (fds[i].fd == -1) {
***************
*** 559,563 ****
       * As of glibc 2.3 with NPTL, this should be a no-op.
       */
- 
      pthread_kill_other_threads_np();
  #endif
--- 564,567 ----