Misc tidying up

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@239 d0cd1f9f-072b-0410-8dd7-cf729c803f20
qcdcool · Jun 2, 2009 · a5ad60c · a5ad60c
1 parent 98204f0
commit a5ad60c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 86 deletions.
diff --git a/ccutil/clst.h b/ccutil/clst.h
@@ -657,7 +657,7 @@ inline void *CLIST_ITERATOR::move_to_first() {
   current = list->First ();
   prev = list->last;
   next = current != NULL ? current->next : NULL;
-  return current->data;
+  return current != NULL ? current->data : NULL;
 }
 
 

diff --git a/ccutil/serialis.cpp b/ccutil/serialis.cpp
@@ -84,6 +84,11 @@ DLLSYM double de_serialise_FLOAT64(FILE *f) {
   return the_float;
 }
 
+// Byte swap an inT64 or uinT64.
+DLLSYM uinT64 reverse64(uinT64 num) {
+  return ((uinT64)reverse32((uinT32)(num & 0xffffffff)) << 32)
+    | reverse32((uinT32)((num >> 32) & 0xffffffff));
+}
 
 /**********************************************************************
  * reverse32

diff --git a/ccutil/serialis.h b/ccutil/serialis.h
@@ -43,12 +43,10 @@ extern DLLSYM void serialise_INT32(FILE *f, inT32 the_int);
 extern DLLSYM inT32 de_serialise_INT32(FILE *f);
 extern DLLSYM void serialise_FLOAT64(FILE *f, double the_float);
 extern DLLSYM double de_serialise_FLOAT64(FILE *f);
-extern DLLSYM uinT32 reverse32(            //switch endian
-                               uinT32 num  //number to fix
-                              );
-extern DLLSYM uinT16 reverse16(            //switch endian
-                               uinT16 num  //number to fix
-                              );
+// Switch endinan.
+extern DLLSYM uinT64 reverse64(uinT64);
+extern DLLSYM uinT32 reverse32(uinT32);
+extern DLLSYM uinT16 reverse16(uinT16);
 
 /***********************************************************************
   QUOTE_IT   MACRO DEFINITION

diff --git a/ccutil/strngs.cpp b/ccutil/strngs.cpp
@@ -409,9 +409,10 @@ STRING & STRING::operator=(const char* cstr) {
     this_header->used_ = len;
   }
   else {
-    // preserve old behavior
-    *GetCStr() = '\0';
-    this_header->used_ = 1;
+    // Reallocate to zero capacity buffer, consistent with the corresponding
+    // copy constructor.
+    DiscardData();
+    AllocData(0, 0);
   }
 
   CHECK_INVARIANT(this);

diff --git a/cutil/emalloc.h b/cutil/emalloc.h
@@ -36,37 +36,9 @@ void *Erealloc(void *ptr, size_t size);
 
 void Efree(void *ptr);
 
-/*
-#if defined(__STDC__) || defined(__cplusplus)
-# define _ARGS(s) s
-#else
-# define _ARGS(s) ()
-#endif*/
-
-/* emalloc.c
-void *Emalloc
-  _ARGS((size_t Size));
-
-void *Erealloc
-  _ARGS((void *ptr,
-  size_t size));
-
-void Efree
-  _ARGS((void *ptr));
-
-#undef _ARGS
-*/
 
 /**----------------------------------------------------------------------------
         Global Data Definitions and Declarations
 ----------------------------------------------------------------------------**/
 
-//extern void* c_alloc_struct();
-//#define alloc_struct c_alloc_struct
-/*extern void c_free_struct(void*
-              deadstruct,					//structure to free
-inT32						count,						//no of bytes
-const char*					name						//class name
-);*/
-//#define free_struct c_free_struct
 #endif
diff --git a/cutil/freelist.cpp b/cutil/freelist.cpp
@@ -10,24 +10,14 @@
  ** limitations under the License.
 **************************************************************************/
 #include "freelist.h"
-#include "danerror.h"
-#include "callcpp.h"
 
 #include <memory.h>
 
-static int mem_alloc_counter = 0;
+#include "danerror.h"
+#include "memry.h"
+#include "tprintf.h"
 
-/**********************************************************************
- * memalloc_p
- *
- * Memory allocator with protection.
- **********************************************************************/
-int *memalloc_p(int size) {
-  mem_alloc_counter++;
-  if (!size)
-    DoError (0, "Allocation of 0 bytes");
-  return ((int *) c_alloc_mem_p (size));
-}
+static int mem_alloc_counter = 0;
 
 
 /**********************************************************************
@@ -37,7 +27,7 @@ int *memalloc_p(int size) {
  **********************************************************************/
 int *memalloc(int size) {
   mem_alloc_counter++;
-  return ((int *) c_alloc_mem (size));
+  return ((int *) alloc_mem (size));
 }
 
 
@@ -51,9 +41,9 @@ int *memrealloc(void *ptr, int size, int oldsize) {
   int *newbuf;
 
   shiftsize = size > oldsize ? oldsize : size;
-  newbuf = (int *) c_alloc_mem (size);
+  newbuf = (int *) alloc_mem (size);
   memcpy(newbuf, ptr, shiftsize);
-  c_free_mem(ptr);
+  free_mem(ptr);
   return newbuf;
 }
 
@@ -65,11 +55,11 @@ int *memrealloc(void *ptr, int size, int oldsize) {
  **********************************************************************/
 void memfree(void *element) {
   if (element) {
-    c_free_mem(element);
+    free_mem(element);
     mem_alloc_counter--;
   }
   else {
-    cprintf ("%d MEM_ALLOC's used\n", mem_alloc_counter);
+    tprintf ("%d MEM_ALLOC's used\n", mem_alloc_counter);
     DoError (0, "Memfree of NULL pointer");
   }
 }
@@ -81,5 +71,5 @@ void memfree(void *element) {
  * Do nothing.
  **********************************************************************/
 void mem_tidy(int level) {
-  c_check_mem ("Old tidy", level);
+  check_mem ("Old tidy", level);
 }
diff --git a/cutil/freelist.h b/cutil/freelist.h
@@ -34,36 +34,12 @@
 /*----------------------------------------------------------------------
               F u n c t i o n s
 ----------------------------------------------------------------------*/
-int *memalloc_p(int size); 
+int *memalloc(int size);
 
-int *memalloc(int size); 
+int *memrealloc(void *ptr, int size, int oldsize);
 
-int *memrealloc(void *ptr, int size, int oldsize); 
+void memfree(void *element);
 
-void memfree(void *element); 
+void mem_tidy(int level);
 
-void mem_tidy(int level); 
-
-/*
-#if defined(__STDC__) || defined(__cplusplus)
-# define _ARGS(s) s
-#else
-# define _ARGS(s) ()
-#endif*/
-
-/* freelist.c
-int *memalloc_p
-  _ARGS((int size));
-
-int *memalloc
-  _ARGS((int size));
-
-void memfree
-  _ARGS((void *element));
-
-void mem_tidy
-  _ARGS((void));
-
-#undef _ARGS
-*/
 #endif