Changeset 170 for trunk/src/sh_utmp.c

Timestamp:

Apr 30, 2008, 11:56:45 PM (17 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

File:

• trunk/src/sh_utmp.c (modified) (8 diffs)

trunk/src/sh_utmp.c

@@ -472 +472 @@
  *************/
 
-static int sh_utmp_init_internal ()
+static int sh_utmp_init_internal (void)
 {
 
@@ -516 +516 @@
  *************/
 #ifdef HAVE_UTTYPE
-static int sh_utmp_login_clean();
+static int sh_utmp_login_clean(void);
 #endif
 
@@ -633 +633 @@
 int sh_utmp_set_login_timer (const char * c)
 {
-  int retval = 0;
   long val;
 
@@ -644 +643 @@
                        _("utmp timer"), c);
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
-      retval = -1;
-    }
-
-  val = (val <= 0 ? 60 : val);
+      SL_RETURN((-1), _("sh_utmp_set_login_timer"));
+    }
 
   ShUtmpInterval = (time_t) val;
@@ -670 +667 @@
 static struct login_ct * login_ct_list = NULL;
 
-static int sh_utmp_login_clean()
+static int sh_utmp_login_clean(void)
 {
   struct login_ct * list = login_ct_list;
@@ -776 +773 @@
  * by longjmp' warning. And no, 'volatile' proved insufficient.
  */
-void * sh_dummy_userold = NULL;
-void * sh_dummy_user    = NULL;
+static void * sh_dummy_userold = NULL;
+static void * sh_dummy_user    = NULL;
 
 
@@ -1063 +1060 @@
   int           error;
   struct SH_UTMP_S * ut;
-  unsigned long this_read = 0;
+  unsigned long this_read;
   int           val_retry;
 
@@ -1123 +1120 @@
    * we need to do this here
    */
+  this_read = 0;
+
   if (mode < 2)
     {