gnue/geas/src geas-server.c geas-server.h objec...

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/05/24 14:41:14

Modified files:
        geas/src       : geas-server.c geas-server.h 
        geas/src/objectstore: objectstore.c objectstore.h 

Log message:
        Made show_version private to geas-server.c to increase cohesion

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.c.diff?cvsroot=OldCVS&tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-server.h.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/objectstore.c.diff?cvsroot=OldCVS&tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/objectstore.h.diff?cvsroot=OldCVS&tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.79 gnue/geas/src/geas-server.c:1.80
--- gnue/geas/src/geas-server.c:1.79    Mon May 14 14:57:57 2001
+++ gnue/geas/src/geas-server.c Thu May 24 14:41:13 2001
@@ -724,7 +724,7 @@
          break;
       case 'V':
          /* display version then quit */
-         show_version(stdout, FULL_VERSION);
+         show_version(stdout);
          if (fatal < 1)
             fatal = 1;
          break;
@@ -826,7 +826,7 @@
 #endif
 
    if (allow_show_version())
-      show_version(stdout, FULL_VERSION);
+      show_version(stdout);
 
    /* display options in debug mode */
    if (allow_show_config())
@@ -1089,15 +1089,13 @@
 /** \brief Display the program version
  */
 void
-show_version(FILE * fp, int length)
+show_version(FILE * fp)
    {
-   fprintf(fp, "\n" PROGRAM " " VERSIONSTR);
+   fprintf(fp, "\nGNU Enterprise Application Server\nVersion " VERSION);
 
-   if (length == FULL_VERSION)
-      {
-      fprintf(fp, ""                                                    /* 
blank bit so that in the worst
-                                                                               
                                            case, the function still
-                                                                               
                                            compiles */
+   fprintf(fp, ""                           /* blank bit so that in the worst
+                                               case, the function still
+                                               compiles */
 #ifdef DEBUG
               " DEBUG"
 #endif
@@ -1118,12 +1116,10 @@
               " All libgda supported databases"
 #endif
              );
-      }
-   else
-      fprintf(fp, "\n");
 
    fprintf(fp,
-           "\n" COPYRIGHTLINE "\n\nSee the file 'COPYING' for details of"
+           "\nCopyright 2001 Free Software Foundation\n"
+           "\nSee the file 'COPYING' for details of"
            " the Gnu Public License\nthat covers this program\n\n"
            "http://www.gnue.org/\n\n";);
    }
Index: gnue/geas/src/geas-server.h
diff -u gnue/geas/src/geas-server.h:1.35 gnue/geas/src/geas-server.h:1.36
--- gnue/geas/src/geas-server.h:1.35    Mon May 14 14:57:57 2001
+++ gnue/geas/src/geas-server.h Thu May 24 14:41:13 2001
@@ -54,10 +54,6 @@
 /* utility function prototypes */
 gboolean is_extension(char *filename, char *ext);
 
-void show_version( FILE *fp , int length );
-#define SHORT_VERSION 1
-#define FULL_VERSION  2
-
 /* help ensure DEBUG_SECURITY is associated with DEBUG in critical areas
    all .C files must include this in order to obtain the debug output
    macros and function prototypes.                                       */
@@ -70,10 +66,6 @@
 #ifndef LIBCONFIG_H
 #include "config/configuration.h"
 #endif
-
-#define PROGRAM        "Gnu Enterprise Application Server"
-#define VERSIONSTR     "Version "VERSION
-#define COPYRIGHTLINE  "Copyright 2001 by the Free Software Foundation"
 
 /* error messages */
 void do_fatal_error(char *file, int line,char *func, char *fmt, ...);
Index: gnue/geas/src/objectstore/objectstore.c
diff -u gnue/geas/src/objectstore/objectstore.c:1.55 
gnue/geas/src/objectstore/objectstore.c:1.56
--- gnue/geas/src/objectstore/objectstore.c:1.55        Tue May 22 13:06:21 2001
+++ gnue/geas/src/objectstore/objectstore.c     Thu May 24 14:41:14 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: objectstore.c,v 1.55 2001/05/22 20:06:21 reinhard Exp $
+   $Id: objectstore.c,v 1.56 2001/05/24 21:41:14 reinhard Exp $
 */
 
 #include "config.h"
@@ -186,10 +186,9 @@
 
   if (changefile)
     {
-      show_version (changefile, SHORT_VERSION);
       fprintf (changefile,
                
"===========================================================================\n");
-      fprintf (changefile, "Database change requirements information\n");
+      fprintf (changefile, "GEAS Database change requirements information\n");
       fprintf (changefile,
                
"===========================================================================\n\n");
       fclose (changefile);
Index: gnue/geas/src/objectstore/objectstore.h
diff -u gnue/geas/src/objectstore/objectstore.h:1.17 
gnue/geas/src/objectstore/objectstore.h:1.18
--- gnue/geas/src/objectstore/objectstore.h:1.17        Tue May 22 12:05:11 2001
+++ gnue/geas/src/objectstore/objectstore.h     Thu May 24 14:41:14 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: objectstore.h,v 1.17 2001/05/22 19:05:11 reinhard Exp $
+   $Id: objectstore.h,v 1.18 2001/05/24 21:41:14 reinhard Exp $
 */
 
 #ifndef _OBJECTSTORE_H
@@ -30,7 +30,6 @@
 #include "config/configuration.h"
 #include "objectcache/objectcache.h"
 #include "oql/oql.h"
-#include "geas-server.h"
 
 typedef void         *DatabaseResultRow;