Changeset 39407

Timestamp:

Feb 26, 2016, 10:15:45 AM (10 years ago)

Author:

eugene

Message:

address pedantic compilation errors

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/ohana_allocate.c (modified) (7 diffs)
• src/string.c (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana.h

@@ -239 +239 @@
 # define myAssert(LOGIC,...) { if (!(LOGIC)) { fprintf (stderr, __VA_ARGS__); abort(); } }
 # define myAbort(MSG) { fprintf (stderr, "%s\n", MSG); abort(); }
+
+// a no-op to mark unused parameters in a function
+# define OHANA_UNUSED_PARAM(x)(void)(x)
 
 // sorting is now defined as a macro call

trunk/Ohana/src/libohana/src/ohana_allocate.c

@@ -46 +46 @@
 void *ohana_malloc (const char *file, int line, const char *func, size_t Nelem, size_t esize) {
 
-  void *ptr;                  // actual user memory allocated
+  char *ptr;                  // actual user memory allocated
   OhanaMemblock *new;         // new memblock created to track the user memory
   size_t size;                // total number of bytes requested (not items)
@@ -144 +144 @@
   // XXX for a test, we are going to always alloc a new block, copy the old data to the new block
   // poison the old block, then free it
-  new = (OhanaMemblock *) malloc (sizeof(OhanaMemblock) + size + sizeof(void *));
+  new = (OhanaMemblock *) malloc (sizeof(OhanaMemblock) + size + 2*sizeof(void *));
   if (new == NULL) ohana_memabort ("failed to reallocate memory (%s, %d, %s)\n", file, line, func);
-  void *ptr_new = (char *) (new + 1);
-  void *ptr_old = (char *) (old + 1);
+  char *ptr_new = (char *) (new + 1);
+  char *ptr_old = (char *) (old + 1);
   size_t copy_bytes = old->size < size ? old->size : size;
   memcpy (ptr_new, ptr_old, copy_bytes);
@@ -156 +156 @@
   // ask for new memory
   // total size is : memblock + data + endpost
-  new = (OhanaMemblock *) realloc (old, sizeof(OhanaMemblock) + size + sizeof(void *));
+  new = (OhanaMemblock *) realloc (old, sizeof(OhanaMemblock) + size + 2*sizeof(void *));
   if (new == NULL) ohana_memabort ("failed to reallocate memory (%s, %d, %s)\n", file, line, func);
-  void *ptr_new = (char *) (new + 1);
+  char *ptr_new = (char *) (new + 1);
 # endif
   
@@ -201 +201 @@
   pthread_mutex_unlock(&memBlockListMutex);
 
-  return (ptr_new);
+  return (void *) ptr_new;
 }
 
@@ -268 +268 @@
 
   // pointer to the start of the user memory
-  void *ptr = (char *)(ref + 1);
+  char *ptr = (char *)(ref + 1);
   memset (ptr, 0x7f, ref->size);
 
@@ -285 +285 @@
 
 int ohana_memcheck_noop (int allmemory) {
+  OHANA_UNUSED_PARAM(allmemory);
   return TRUE;
 }
@@ -521 +522 @@
 
 OhanaMemstats ohana_memstats (int allmemory) {
+  OHANA_UNUSED_PARAM(allmemory);
 
   OhanaMemstats memstats;

trunk/Ohana/src/libohana/src/string.c

@@ -432 +432 @@
 void uppercase (char *string) {
 
-  int i;
+  unsigned int i;
     
   for (i = 0; i < strlen (string); i++) string[i] = toupper (string[i]);