Changeset 153 for trunk/src/sh_hash.c

Timestamp:

Jan 11, 2008, 11:47:17 PM (17 years ago)

Author:

katerina

Message:

Use -D_FORTIFY_SOURCE=1 -fstack-protector-all if supported. Compiler warnings fixed.

File:

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

trunk/src/sh_hash.c

@@ -459 +459 @@
 
  unlock_and_return:
+  ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
   return retval;
@@ -1349 +1350 @@
 
  unlock_and_return:
+  ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
   SL_RET0(_("sh_hash_init"));
@@ -1377 +1379 @@
 
  unlock_and_exit:
+  ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
   SL_RET0(_("sh_hash_hashdelete"));
@@ -1792 +1795 @@
         sl_write_line_fast (pushdata_fd, attr_string, sl_strlen(attr_string));
     } else {
-      fwrite (&p, sizeof(sh_filestore_t), 1, stdout);
-      printf ("%s\n", fullpath);
-      printf ("%s\n", linkpath);
-      if (attr_string)
-        printf ("%s\n", attr_string);
+      if (fwrite (&p, sizeof(sh_filestore_t), 1, stdout))
+        {
+          printf ("%s\n", fullpath);
+          printf ("%s\n", linkpath);
+          if (attr_string)
+            printf ("%s\n", attr_string);
+        }
+      else
+        {
+          perror(_("Error writing database"));
+          aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+        }
     }
 
@@ -2728 +2738 @@
 
   char log_policy[32];
-  int  log_severity;
+  volatile int  log_severity;
   char hashbuf[KEYBUF_SIZE];
 
@@ -3504 +3514 @@
 
  unlock_and_return:
-
+  ; /* 'label at end of compound statement */
   SH_MUTEX_UNLOCK(mutex_hash);
   SL_RETURN(retval, _("sh_hash_compdata"));