Changeset 1369

Timestamp:

2000-08-07T16:46:31+12:00 (24 years ago)

Author:

jrm21

Message:

Modified handling of error/log file for parser, to make more portable
(ie SunOS 5.6 stderr is #defined, not of type FILE *, so can't do
stderr=...)

Location:

trunk/gsdl/src/recpt

Files:

• z3950cfg.h (modified) (1 diff)
• z3950proto.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/z3950cfg.h

@@ -25 +25 @@
 };
 extern struct z3950cfg *zserver_list;
+extern FILE *errfile;
 #endif

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -61 +61 @@
   z3950_server *zserver;
   ShortColInfo_t *tempinfo;
-  FILE *stderr_tmp, *err;
-
-  err=fopen(errf.getcstr(), "a");
-  stderr_tmp=stderr;
-  if (err==NULL) {
+  FILE *errfile;
+
+  if ((errfile=fopen(errf.getcstr(),"a"))==NULL) {
     // what do we do if we can't open the error file?
     // this means that errors will go to stderr, which may stuff up 
     // any cgi headers and the page.
-  } else {
-    stderr=err;
+    errfile=stderr;
   }
 
@@ -82 +79 @@
   }
   zconfigparse();
-  if (err!=NULL) {
-    fclose(err);
-    stderr=stderr_tmp;
-  }
+
+  if (errfile!=stderr)
+    fclose(errfile);
 
   // we now have the config files in the ptr zserver_list