Misc fixes

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@942 d0cd1f9f-072b-0410-8dd7-cf729c803f20

ccutil/errcode.h

@@ -81,15 +81,20 @@ class TESS_API ERRCODE {           // error handler class
 
 const ERRCODE ASSERT_FAILED = "Assert failed";
 
-#define ASSERT_HOST(x) if (!(x))										\
-{																			\
-	ASSERT_FAILED.error(#x,ABORT,"in file %s, line %d",		\
-		__FILE__,__LINE__);											\
-}
-
-void signal_exit(                 //
-                 int signal_code  //Signal which
-                );
+#define ASSERT_HOST(x) if (!(x))                                        \
+  {                                                                     \
+    ASSERT_FAILED.error(#x, ABORT, "in file %s, line %d",               \
+                        __FILE__, __LINE__);                            \
+  }
+
+#define ASSERT_HOST_MSG(x, msg...) if (!(x))                            \
+  {                                                                     \
+    tprintf(msg);                                                       \
+    ASSERT_FAILED.error(#x, ABORT, "in file %s, line %d",               \
+                        __FILE__, __LINE__);                            \
+  }
+
+void signal_exit(int signal_code);
 
 void set_global_loc_code(int loc_code);
 

ccutil/unicharset.cpp

@@ -837,7 +837,7 @@ bool UNICHARSET::load_via_fgets(
                       script, &other_case)) != 4 &&
           (v = sscanf(buffer, "%s %x %63s",
                       unichar, &properties, script)) != 3 &&
-          (v = sscanf(buffer, "%s %x", unichar, &properties) != 2))) {
+          (v = sscanf(buffer, "%s %x", unichar, &properties)) != 2)) {
       return false;
     }