diff src/noffle.c @ 61:adf0af5152f7 noffle

[svn] Renamed some variables and function names, because they caused compiler warnings because of shadowing global variables from system include files (index, stat, serv).
author enz
date Fri, 12 May 2000 18:19:38 +0100
parents 125d79c9e586
children 1fcdced0246e
line wrap: on
line diff
--- a/src/noffle.c	Fri May 12 17:52:58 2000 +0100
+++ b/src/noffle.c	Fri May 12 18:19:38 2000 +0100
@@ -2,7 +2,7 @@
   noffle.c
 
   Main program. Implements specified actions, but running as server, which
-  is done by Serv_run(), declared in server.h.
+  is done by Server_run(), declared in server.h.
   
   Locking policy: lock access to databases while noffle is running, but
   not as server. If noffle runs as server, locking is performed while
@@ -10,7 +10,7 @@
   received for some seconds (to allow multiple clients connect at the same
   time).
 
-  $Id: noffle.c 60 2000-05-09 22:28:38Z uh1763 $
+  $Id: noffle.c 67 2000-05-12 17:19:38Z enz $
 */
 
 #if HAVE_CONFIG_H
@@ -355,7 +355,7 @@
             case OVER:
                 modeStr = "over"; break;
             }
-            printf( "%s %s %s\n", name, Grp_serv( name ), modeStr );
+            printf( "%s %s %s\n", name, Grp_server( name ), modeStr );
         }
 }
 
@@ -437,7 +437,7 @@
             strftime( dateCreated, MAXCHAR, "%Y-%m-%d %H:%M:%S",
                       localtime( &created ) );
             printf( "%s\t%s\t%i\t%i\t%i\t%c\t%s\t%s\t%s\n",
-                    g, Grp_serv( g ), Grp_first( g ), Grp_last( g ),
+                    g, Grp_server( g ), Grp_first( g ), Grp_last( g ),
                     Grp_rmtNext( g ), Grp_postAllow( g ), dateCreated,
                     dateLastAccess, Grp_dsc( g ) );
         }
@@ -748,7 +748,7 @@
         break;
     case 'r':
         Log_inf( "Starting as server" );
-        Serv_run();
+        Server_run();
         break;
     case 'R':
         doRequested( optarg );