Changeset 474 for trunk/src

Timestamp:

May 30, 2015, 7:57:16 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #372 (Replace obsolete smatch by clang in test suite).

Location:

trunk/src

Files:

• cutest_sh_unix.c (modified) (1 diff)
• sh_err_console.c (modified) (2 diffs)
• sh_gpg.c (modified) (1 diff)
• sh_hash.c (modified) (2 diffs)
• sh_inotify.c (modified) (1 diff)
• sh_nmail.c (modified) (1 diff)
• sh_srp.c (modified) (1 diff)
• sh_suidchk.c (modified) (1 diff)
• sh_tiger1_64.c (modified) (1 diff)
• sh_unix.c (modified) (1 diff)
• sh_utmp.c (modified) (1 diff)
• trustfile.c (modified) (1 diff)
• zAVLTree.c (modified) (2 diffs)

trunk/src/cutest_sh_unix.c

@@ -42 +42 @@
       CuAssertPtrNotNull(tc, buf);
 #ifndef USE_SYSTEM_MALLOC
+#ifndef __clang__
       CuAssertIntEquals (tc, malloc_count, (i_malloc + 1));
+#endif
 #endif
       free(buf);

trunk/src/sh_err_console.c

@@ -328 +328 @@
   /* --- daemon && initialized ---
    */
-  if ( (OnlyStderr == S_FALSE) ) 
+  if ( OnlyStderr == S_FALSE ) 
     {
       fd[0] = open ( sh.srvcons.name, O_WRONLY|O_APPEND|O_NOCTTY|O_NONBLOCK);
@@ -340 +340 @@
       }
 
-      if (sh.srvcons.alt != NULL && sh.srvcons.alt[0] != '\0')
+      if (sh.srvcons.alt[0] != '\0')
         {
           fd[1] = open (sh.srvcons.alt, O_WRONLY|O_APPEND|O_NOCTTY|O_NONBLOCK);

trunk/src/sh_gpg.c

@@ -419 +419 @@
   /* use homedir of effective user
    */
-  if (sh.effective.home != NULL)
-    {
-      len = sl_strlen(sh.effective.home) + 6;
-      envp[0] = calloc(1, len); /* free() ok   */
-      if (envp[0] != NULL)
+  len = sl_strlen(sh.effective.home) + 6;
+  envp[0] = calloc(1, len); /* free() ok   */
+  if (envp[0] != NULL)
         sl_snprintf (envp[0], len, _("HOME=%s"), sh.effective.home); 
-      envp[1] = NULL;
-    }
-  else
-    {
-      envp[0] = NULL;
-    }
+  envp[1] = NULL;
 
   /* Create the pipe 

trunk/src/sh_hash.c

@@ -1751 +1751 @@
     }
          
-  if (buf != NULL && buf->fullpath != NULL) {
+  if (buf != NULL) {
 
     old_len = sl_strlen(buf->fullpath);
@@ -3099 +3099 @@
         theFile->fullpath, fileHash, p->theFile.checksum));
 
-  if ( (fileHash != NULL) && (p->theFile.checksum != NULL)   && 
+  if ( (fileHash != NULL) &&
        (strncmp (fileHash, p->theFile.checksum, KEY_LEN) != 0) && 
        (theFile->check_mask & MODI_CHK) != 0)

trunk/src/sh_inotify.c

@@ -22 +22 @@
 #if defined(HAVE_SYS_INOTIFY_H)
 
-#if defined(GCC_VERSION_MAJOR)
+#if defined(GCC_VERSION_MAJOR) && !defined(__clang__)
 #if (GCC_VERSION_MAJOR > 4) || ((GCC_VERSION_MAJOR == 4) && (GCC_VERSION_MINOR > 8))
 #pragma GCC diagnostic ignored "-Wclobbered"

trunk/src/sh_nmail.c

@@ -24 +24 @@
 #endif
 
-#if defined(GCC_VERSION_MAJOR)
+#if defined(GCC_VERSION_MAJOR) && !defined(__clang__)
 #if (GCC_VERSION_MAJOR > 4) || ((GCC_VERSION_MAJOR == 4) && (GCC_VERSION_MINOR > 8))
 #pragma GCC diagnostic ignored "-Wclobbered"

trunk/src/sh_srp.c

@@ -86 +86 @@
 int    siz_str_internal = 0;
 
-inline
+static
 char * big_string (bignum * a, int base)
 {

trunk/src/sh_suidchk.c

@@ -203 +203 @@
   ShSuidchkSeverity = SH_ERR_SEVERE;
   if (ShSuidchkExclude != NULL)
-    sh_suid_exclude_free(ShSuidchkExclude);
+    sh_suid_exclude_free();
 
   FileLimNow        = 0;

trunk/src/sh_tiger1_64.c

@@ -5 +5 @@
 #include "config_xor.h"
 
+#if defined(__clang__)
+#undef TIGER_OPT_ASM
+#endif
+
 #if defined(TIGER_64_BIT)
 
-#if defined(GCC_VERSION_MAJOR)
+#if defined(GCC_VERSION_MAJOR) && !defined(__clang__)
 #if ((GCC_VERSION_MAJOR == 4) && (GCC_VERSION_MINOR > 6))
 #pragma GCC optimize ("O1")
 #endif
 #endif
+
 
 /* #if defined(HAVE_LONG_64) || defined(HAVE_LONG_LONG_64) */

trunk/src/sh_unix.c

@@ -972 +972 @@
 
   SL_ENTER(_("sh_unix_self_check"));
-  if (sh.exec.path == NULL || sh.exec.path[0] == '\0')
+  if (sh.exec.path[0] == '\0')
     SL_RETURN((0), _("sh_unix_self_check"));
 

trunk/src/sh_utmp.c

@@ -319 +319 @@
   SL_ENTER(_("sh_utmp_setutent"));
 
-  ASSERT((sh_utmppath != NULL), _("sh_utmppath != NULL"));
-
-  if (sh_utmppath == NULL)
-    SL_RET0(_("sh_utmp_setutent"));
-
   if (sh_utmpfile == NULL) 
     {

trunk/src/trustfile.c

@@ -211 +211 @@
 #define SL_ALWAYS_TRUSTED  0
 #endif
-static uid_t test_rootonly[] = { SL_ALWAYS_TRUSTED };
+uid_t test_rootonly[] = { SL_ALWAYS_TRUSTED };
 
 #define tf_uid_neg ((uid_t)-1)

trunk/src/zAVLTree.c

@@ -39 +39 @@
   return (zAVLKey) arg;
 }
+
 static char * dummy_zfree_string;
+#ifdef __clang__
+static char * dummy_zfree_str;
+#endif
+
 static void zfree_string (void * inptr)
 {
+#ifdef __clang__
+  dummy_zfree_str = (char *) inptr;
+#else
   char * str = (char *) inptr;
+#endif
 
   /* Take the address to circumvent gcc 4.9 optimizer bug */
   dummy_zfree_string = (char *) &inptr;
 
+#ifdef __clang__
+  dummy_zfree_str[0] = '\0';
+  free (dummy_zfree_str);
+#else
   str[0] = '\0';
   free (inptr);
+#endif
   return;
 }
@@ -537 +551 @@
   if (avlnode->right)
     zAVLFreeBranch(avlnode->right, freeitem);
-  if (freeitem)
+  if (freeitem) {
     freeitem(avlnode->item);
+    avlnode->item = NULL;
+  }
   free(avlnode);
 }