Changeset 132 for trunk/src/sh_hash.c

Timestamp:

Oct 23, 2007, 11:44:41 PM (17 years ago)

Author:

rainer

Message:

Make utility functions thread-safe.

File:

• trunk/src/sh_hash.c (modified) (14 diffs)

trunk/src/sh_hash.c

@@ -1404 +1404 @@
 
   char   timestring[81];
-  char * timep;
 
 #if !defined(__linux__) && !defined(HAVE_STAT_FLAGS)
@@ -1706 +1705 @@
                             sl_strlen(sh_db_version_string));
                   sl_write (pushdata_fd, _(" Date "), 6);
-                  timep = sh_unix_time(0);
-                  sl_strlcpy(timestring, timep, sizeof(timestring));
+                  (void) sh_unix_time(0, timestring, sizeof(timestring));
                   sl_write (pushdata_fd, timestring, sl_strlen(timestring));
                   sl_write (pushdata_fd,        "\n", 1);
@@ -1716 +1714 @@
                   printf ("%s", sh_db_version_string);
                   printf (_(" Date "));
-                  timep = sh_unix_time(0);
-                  sl_strlcpy(timestring, timep, sizeof(timestring));
+                  (void) sh_unix_time(0, timestring, sizeof(timestring));
                   printf ("%s\n", timestring);
                 }
@@ -2343 +2340 @@
 
 
-  sl_strlcpy (timstr1c, sh_unix_gmttime (theFile->ctime),   32);
+  (void) sh_unix_gmttime (theFile->ctime, timstr1c,  sizeof(timstr1c));
   if (is_new)
     sl_snprintf(tmp, SH_BUFSIZE, _("ctime_new=\"%s\" "), timstr1c);
@@ -2350 +2347 @@
   sl_strlcat(msg, tmp, SH_BUFSIZE); 
 
-  sl_strlcpy (timstr1a, sh_unix_gmttime (theFile->atime),   32);
+  (void) sh_unix_gmttime (theFile->atime, timstr1a,  sizeof(timstr1a));
   if (is_new)
     sl_snprintf(tmp, SH_BUFSIZE, _("atime_new=\"%s\" "), timstr1a);
@@ -2357 +2354 @@
   sl_strlcat(msg, tmp, SH_BUFSIZE); 
 
-  sl_strlcpy (timstr1m, sh_unix_gmttime (theFile->mtime),   32);
+  (void) sh_unix_gmttime (theFile->mtime, timstr1m,  sizeof(timstr1m));
   if (is_new)
     sl_snprintf(tmp, SH_BUFSIZE, _("mtime_new=\"%s\" "), timstr1m);
@@ -2509 +2506 @@
 
 
-  sl_strlcpy (timstr1c, sh_unix_gmttime (theFile->ctime),   32);
+  (void) sh_unix_gmttime (theFile->ctime, timstr1c,  sizeof(timstr1c));
   if (is_new)
     sl_snprintf(tmp, SH_BUFSIZE, _("ctime_new=<%s>, "), timstr1c);
@@ -2516 +2513 @@
   sl_strlcat(msg, tmp, SH_BUFSIZE); 
 
-  sl_strlcpy (timstr1a, sh_unix_gmttime (theFile->atime),   32);
+  (void) sh_unix_gmttime (theFile->atime, timstr1a,  sizeof(timstr1a));
   if (is_new)
     sl_snprintf(tmp, SH_BUFSIZE, _("atime_new=<%s>, "), timstr1a);
@@ -2523 +2520 @@
   sl_strlcat(msg, tmp, SH_BUFSIZE); 
 
-  sl_strlcpy (timstr1m, sh_unix_gmttime (theFile->mtime),   32);
+  (void) sh_unix_gmttime (theFile->mtime, timstr1m,  sizeof(timstr1m));
   if (is_new)
     sl_snprintf(tmp, SH_BUFSIZE, _("mtime_new=<%s>, "), timstr1m);
@@ -3145 +3142 @@
       if ((modi_mask & MODI_CTM) != 0)
         {
-          sl_strlcpy (timstr1c, sh_unix_gmttime (p->theFile.ctime), 32);
-          sl_strlcpy (timstr2c, sh_unix_gmttime (theFile->ctime),   32);
+          (void) sh_unix_gmttime (p->theFile.ctime, timstr1c, sizeof(timstr1c));
+          (void) sh_unix_gmttime (theFile->ctime,   timstr2c, sizeof(timstr2c));
 #ifdef SH_USE_XML
           sl_snprintf(tmp, SH_BUFSIZE, _("ctime_old=\"%s\" ctime_new=\"%s\" "),
@@ -3163 +3160 @@
       if ((modi_mask & MODI_ATM) != 0)
         {
-          sl_strlcpy (timstr1a, sh_unix_gmttime (p->theFile.atime), 32);
-          sl_strlcpy (timstr2a, sh_unix_gmttime (theFile->atime),   32);
+          (void) sh_unix_gmttime (p->theFile.atime, timstr1a, sizeof(timstr1a));
+          (void) sh_unix_gmttime (theFile->atime,   timstr2a, sizeof(timstr2a));
 #ifdef SH_USE_XML
           sl_snprintf(tmp, SH_BUFSIZE, _("atime_old=\"%s\" atime_new=\"%s\" "),
@@ -3181 +3178 @@
       if ((modi_mask & MODI_MTM) != 0)
         {
-          sl_strlcpy (timstr1m, sh_unix_gmttime (p->theFile.mtime), 32);
-          sl_strlcpy (timstr2m, sh_unix_gmttime (theFile->mtime),   32);
+          (void) sh_unix_gmttime (p->theFile.mtime, timstr1m, sizeof(timstr1m));
+          (void) sh_unix_gmttime (theFile->mtime,   timstr2m, sizeof(timstr2m));
 #ifdef SH_USE_XML
           sl_snprintf(tmp, SH_BUFSIZE, _("mtime_old=\"%s\" mtime_new=\"%s\" "),
@@ -3579 +3576 @@
 
   if ('c' == p->theFile.c_mode[0] || 'b' == p->theFile.c_mode[0])
-    sl_snprintf(str, 80, "%"PRIu64, p->theFile.rdev);
-  else
-    sl_snprintf(str, 80, "%"PRIu64, p->theFile.size);
+    sl_snprintf(str, sizeof(str), "%"PRIu64, p->theFile.rdev);
+  else
+    sl_snprintf(str, sizeof(str), "%"PRIu64, p->theFile.size);
 
   printf( _(" %8s"), str);
@@ -3587 +3584 @@
     putchar(',');
 
-  printf( _(" %s"), sh_unix_gmttime (p->theFile.ctime));
+  printf( _(" %s"), sh_unix_gmttime (p->theFile.ctime, str, sizeof(str)));
   if (ListWithDelimiter == S_TRUE)
     putchar(',');
-  printf( _(" %s"), sh_unix_gmttime (p->theFile.mtime));
+  printf( _(" %s"), sh_unix_gmttime (p->theFile.mtime, str, sizeof(str)));
   if (ListWithDelimiter == S_TRUE)
     putchar(',');
-  printf( _(" %s"), sh_unix_gmttime (p->theFile.atime));
+  printf( _(" %s"), sh_unix_gmttime (p->theFile.atime, str, sizeof(str)));
   if (ListWithDelimiter == S_TRUE)
     putchar(',');