[Dhcp-agent-commits] dhcp-agent dhcp-util.c,1.21,1.22

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv1153

Modified Files:
	dhcp-util.c 
Log Message:
message routines procified

Index: dhcp-util.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-util.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dhcp-util.c	30 Jun 2002 08:23:45 -0000	1.21
--- dhcp-util.c	2 Jul 2002 16:45:37 -0000	1.22
***************
*** 47,50 ****
--- 47,65 ----
  }
  
+ /* message proc workhorse */
+ static void message_proc(char *prefix, char *fmt, va_list ap)
+ {
+ 
+     vsnprintf(msgbuff, sizeof(msgbuff), fmt, ap);
+     
+     if(interactive == 1)  {
+         fprintf(stderr, "%s: %s: %s", getprogname(), prefix, msgbuff);
+         fprintf(stderr,"\n");
+     } else
+         error_log(msgbuff);
+ 
+     return;
+ }
+ 
  /* send error message. */
  void error_message(char *fmt, ...)
***************
*** 52,69 ****
      va_list ap;
  
!     if(verbosity_level == QUIET_VERBOSITY_LEVEL)
          return;
      
      va_start(ap, fmt);
  
!     vsnprintf(msgbuff, sizeof(msgbuff), fmt, ap);
! 
!     if(interactive == 1)  {
!         fprintf(stderr, "%s: error: %s", getprogname(), msgbuff);
!         fprintf(stderr,"\n");
!     } else
!         error_log(msgbuff);
  
      va_end(ap);
  }
  
--- 67,80 ----
      va_list ap;
  
!     if(get_verbosity_level() == QUIET_VERBOSITY_LEVEL)
          return;
      
      va_start(ap, fmt);
  
!     message_proc("error", fmt, ap);
  
      va_end(ap);
+ 
+     return;
  }
  
***************
*** 73,91 ****
      va_list ap;
  
!     if(verbosity_level == QUIET_VERBOSITY_LEVEL)
          return;
! 
      va_start(ap, fmt);
  
!     vsnprintf(msgbuff, sizeof(msgbuff), fmt, ap);
!     
!     if(interactive == 1)  {
!         fprintf(stderr, "%s: fatal error: %s", getprogname(), msgbuff);
!         fprintf(stderr,"\n");
!     } else
!         error_log(msgbuff);
  
!     exit(1);
  
  }
  
--- 84,97 ----
      va_list ap;
  
!     if(get_verbosity_level() == QUIET_VERBOSITY_LEVEL)
          return;
!     
      va_start(ap, fmt);
  
!     message_proc("fatal error", fmt, ap);
  
!     va_end(ap);
  
+     exit(1);
  }
  
***************
*** 94,98 ****
  {
      char *c = NULL;
!     if(verbosity_level == QUIET_VERBOSITY_LEVEL)
          return;
      
--- 100,104 ----
  {
      char *c = NULL;
!     if(get_verbosity_level() == QUIET_VERBOSITY_LEVEL)
          return;
      
***************
*** 131,148 ****
      va_list ap;
  
!     if(!(verbosity_level >= NORMAL_VERBOSITY_LEVEL))
          return;
      
      va_start(ap, fmt);
  
!     vsnprintf(msgbuff, sizeof(msgbuff), fmt, ap);
!     
!     if(interactive == 1)  {
!         fprintf(stdout, "%s: %s", getprogname(), msgbuff);
!         fprintf(stdout,"\n");
!     } else
!         info_log(msgbuff);
  
      va_end(ap);
  }
  
--- 137,150 ----
      va_list ap;
  
!     if(verbosity_level >= NORMAL_VERBOSITY_LEVEL)
          return;
      
      va_start(ap, fmt);
  
!     message_proc("fatal error", fmt, ap);
  
      va_end(ap);
+ 
+     return;
  }
  
***************
*** 152,169 ****
      va_list ap;
  
!     if(!(verbosity_level >= WARNING_VERBOSITY_LEVEL))
          return;
      
      va_start(ap, fmt);
  
!     vsnprintf(msgbuff, sizeof(msgbuff), fmt, ap);
!     
!     if(interactive == 1)  {
!         fprintf(stdout, "%s warning: %s", getprogname(), msgbuff);
!         fprintf(stdout,"\n");
!     } else
!         info_log(msgbuff);
  
      va_end(ap);
  }
  
--- 154,167 ----
      va_list ap;
  
!     if(get_verbosity_level() >= WARNING_VERBOSITY_LEVEL)
          return;
      
      va_start(ap, fmt);
  
!     message_proc("warning", fmt, ap);
  
      va_end(ap);
+ 
+     return;
  }
  
***************
*** 171,190 ****
  void debug_message(char *fmt, ...)
  {
      va_list ap;
  
!     if(!(verbosity_level >= DEBUG_VERBOSITY_LEVEL))
          return;
      
      va_start(ap, fmt);
  
!     vsnprintf(msgbuff, sizeof(msgbuff), fmt, ap);
!     
!     if(interactive == 1)  {
!         fprintf(stdout, "%s: debug: %s", getprogname(), msgbuff);
!         fprintf(stdout,"\n");
!     } else
!         info_log(msgbuff);
  
      va_end(ap);
  }
  
--- 169,185 ----
  void debug_message(char *fmt, ...)
  {
+ 
      va_list ap;
  
!     if(get_verbosity_level()  >= DEBUG_VERBOSITY_LEVEL)
          return;
      
      va_start(ap, fmt);
  
!     message_proc("debug", fmt, ap);
  
      va_end(ap);
+ 
+     return;
  }