[Gnupos-cvs] gnp-server/src GNPS_io.c,1.4,1.5

[<con...@us...>]

Update of /cvsroot/gnupos/gnp-server/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30464

Modified Files:
	GNPS_io.c 
Log Message:
Few small modifications. Start work on reading the config file.

Index: GNPS_io.c
===================================================================
RCS file: /cvsroot/gnupos/gnp-server/src/GNPS_io.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GNPS_io.c	22 Feb 2003 09:07:27 -0000	1.4
--- GNPS_io.c	30 Jun 2003 13:53:27 -0000	1.5
***************
*** 33,43 ****
--- 33,54 ----
  FILE   *gnps_log_fh;
  
+ /*
+  *   Config file functions
+  */
+ 
  void
  gnps_read_config ()
  {
+ FILE    *gnps_conf_fh;
+ 
    if(gnps_debug)
      printf("Entering gnps_read_config()\n");
  
+   if(gnps_global_data.config_file_name==NULL)
+     gnps_global_data.config_file_name="/var/lib/gnp-server/config.xml";
  
+   verprintf("Opening config file %s", gnps_global_data.config_file_name);
+ 
+   gnps_conf_fh - fopen(gnps_global_data.config_file_name, "r");
  
    if(gnps_debug)
***************
*** 45,48 ****
--- 56,63 ----
  }
  
+ /*
+  *    Log file functions
+  */
+ 
  void
  gnps_init_logging ()
***************
*** 120,123 ****
--- 135,157 ----
    if(gnps_debug)
      printf("Leaving logprintf()\n");
+ }
+ 
+ void
+ verprintf(char *template, ...)
+ {
+   va_list vp;
+ 
+   if(gnps_debug)
+     printf("Entering verprintf()\n");
+ 
+   va_start(vp, template);
+   if(gnps_global_data.verbose_logging)
+     logprintf(template, vp);
+   if(gnps_verbose)
+     printf(template, vp);
+   va_end(vp);
+ 
+   if(gnps_debug)
+     printf("Leaving verprintf()\n");
  }