Changeset 383 for trunk/include

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

Location:

trunk/include

Files:

• sh_mem.h (modified) (2 diffs)
• sh_pthread.h (modified) (1 diff)

trunk/include/sh_mem.h

@@ -35 +35 @@
 #define SH_FREE(a)   sh_mem_free((a), FIL__, __LINE__)
 #define SH_ALLOC(a)  sh_mem_malloc((a), FIL__, __LINE__) 
+#define SH_OALLOC(a,b,c)  sh_mem_malloc((a), (b), (c)) 
 
 #else
@@ -51 +52 @@
 #define SH_FREE(a)   sh_mem_free(a)
 #define SH_ALLOC(a)  sh_mem_malloc(a)
+#define SH_OALLOC(a,b,c)  ((void) (b),           \
+                           (void) (c),           \
+                           sh_mem_malloc(a))     \
 
 #endif

trunk/include/sh_pthread.h

@@ -31 +31 @@
         do {                                                               \
                 int oldtype;                                               \
-                int executeStack = 0;                                      \
+                volatile int executeStack = 0;                             \
                 pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldtype);  \
                 pthread_cleanup_push(sh_pthread_mutex_unlock, (void*)&(M));\