Changeset 170 for trunk/src/sh_unix.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_unix.c (modified) (16 diffs)

trunk/src/sh_unix.c

@@ -356 +356 @@
 extern int OnlyStderr; 
 
-int safe_logger (int signal, int method, char * details)
+int safe_logger (int thesignal, int method, char * details)
 {
   unsigned int i = 0;
@@ -396 +396 @@
   if (p && *p)
     sl_strlcat(msg, p, 128);
-  if (signal == 0)
+  if (thesignal == 0)
     {
       if (details == NULL) {
@@ -408 +408 @@
     {
       sl_strlcat(msg, _("]: exit on signal "), 128);
-      p = safe_itoa(signal, str, 128);
+      p = safe_itoa(thesignal, str, 128);
       if (p && *p)
         sl_strlcat(msg, p, 128);
@@ -461 +461 @@
 }
 
-void safe_fatal (char * details, 
-                 char * file, int line)
+void safe_fatal (const char * details, 
+                 const char * file, int line)
 {
   char msg[128];
   char str[128];
   char * p;
-  int  signal = 0;
+  int  thesignal = 0;
   int  method = 0;
 
@@ -479 +479 @@
   }
   sl_strlcat(msg, details, 128);
-  (void) safe_logger (signal, method, msg);
+  (void) safe_logger (thesignal, method, msg);
   _exit(EXIT_FAILURE);
 }
@@ -1060 +1060 @@
 }
 
-extern uid_t   sl_trust_baduid();
-extern gid_t   sl_trust_badgid();
+extern uid_t   sl_trust_baduid(void);
+extern gid_t   sl_trust_badgid(void);
 
 #if defined(HOST_IS_CYGWIN) || defined(__cygwin__) || defined(__CYGWIN32__) || defined(__CYGWIN__)
@@ -1562 +1562 @@
   struct hostent * he1;
   int              i;
-  int              ddot = 0;
+  int              ddot;
   int              len;
   char           * p;
@@ -1632 +1632 @@
    */
   len = sl_strlen(sh.host.name);
+  ddot = 0;
   for (i = 0; i < len; ++i) 
     if (sh.host.name[i] == '.') ++ddot; 
@@ -1660 +1661 @@
   struct hostent * he1;
   int              i;
-  int              ddot = 0;
+  int              ddot;
   int              len;
   char             hostname[1024];
@@ -1691 +1692 @@
    */
   len = sl_strlen(sh.host.name);
+  ddot = 0;
   for (i = 0; i < len; ++i) 
     if (sh.host.name[i] == '.') ++ddot; 
@@ -1772 +1774 @@
 }
 
-int sh_unix_chroot()
+int sh_unix_chroot(void)
 {
   int status;
@@ -1794 +1796 @@
 /* #ifdef SH_WITH_SERVER */
 #else
-int sh_unix_chroot() { return 0; }
+int sh_unix_chroot(void) { return 0; }
 #endif
 
@@ -1850 +1852 @@
   pid_t  oldpid = getpid();
 #if defined(SH_WITH_SERVER) 
-  extern int sh_socket_open_int ();
+  extern int sh_socket_open_int (void);
 #endif
   char errbuf[SH_ERRBUF_SIZE];
@@ -3411 +3413 @@
               UINT64 length_nolim = TIGER_NOLIM;
 
-              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < (10 * SH_TXT_MAX))
+              if (MODI_TXT_ENABLED(theFile->check_mask) && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
@@ -3464 +3466 @@
               UINT64 length_nolim = TIGER_NOLIM;
 
-              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < (10 * SH_TXT_MAX))
+              if (MODI_TXT_ENABLED(theFile->check_mask) && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
@@ -4301 +4303 @@
 SH_MUTEX_STATIC(mutex_mlock,PTHREAD_MUTEX_INITIALIZER);
 
-int sh_unix_mlock (char * file, int line, void * in_addr, size_t len)
+int sh_unix_mlock (const char * file, int line, void * in_addr, size_t len)
 {
   int         num_pages;