comparison lshlib.cpp @ 369:6564be3109c5 gcc-4.3-cleanups

gcc-4.3 warning cleanups for lshlib.cpp

(I do not believe that any of these changes contain significant
copyrightable "intellectual property".  However, to the extent that they
do, the changes are hereby released into the Public Domain, and may be
therefore be used by anyone for any purpose without need for
consideration of any kind.)

 Uns32T get_page_logn(){
   int pagesz = (int)sysconf(_SC_PAGESIZE);
   return (Uns32T)log2((double)pagesz);  
 }
 
-unsigned align_up(unsigned x, unsigned w){ return ((x) + ((1<<w)-1) & ~((1<<w)-1)); }
+unsigned align_up(unsigned x, unsigned w) { return (((x) + ((1<<w)-1)) & ~((1<<w)-1)); }
 
 void H::error(const char* a, const char* b, const char *sysFunc) {
   cerr << a << ": " << b << endl;
   if (sysFunc) {
     perror(sysFunc);

   calling_instance = caller;
   add_point_callback = add_point;
   H::compute_hash_functions( v );
   for(Uns32T j = 0 ; j < H::L ; j++ ){
     H::generate_hash_keys( *( H::g + j ), *( H::r1 + j ), *( H::r2 + j ) ); 
-    if( bucket* bPtr = *(get_bucket(j) + get_t1()) )
+    if( bucket* bPtr = *(get_bucket(j) + get_t1()) ) {
 #ifdef LSH_LIST_HEAD_COUNTERS
-      if(bPtr->t2&LSH_CORE_ARRAY_BIT)
+      if(bPtr->t2&LSH_CORE_ARRAY_BIT) {
 	retrieve_from_core_hashtable_array((Uns32T*)(bPtr->next), qpos);
-      else
+      } else {
 	bucket_chain_point( bPtr->next, qpos);
-#else
-    bucket_chain_point( bPtr , qpos);
-#endif
+      }
+#else
+      bucket_chain_point( bPtr , qpos);
+#endif
+    }
   }
 }
 
 void G::retrieve_point_set(vector<vector<float> >& vv, ReporterCallbackPtr add_point, void* caller){
   for(Uns32T qpos = 0 ; qpos < vv.size() ; qpos++ )

   // Check requested serialFormat
   if(!(serialFormat==O2_SERIAL_FILEFORMAT1 || serialFormat==O2_SERIAL_FILEFORMAT2))
     error("Unrecognized serial file format request: ", "serialize()");
  
   // Test to see if file exists
-  if((dbfid = open (filename, O_RDONLY)) < 0)
+  if((dbfid = open (filename, O_RDONLY)) < 0) {
     // If it doesn't, then create the file (CREATE)
-    if(errno == ENOENT){
+    if(errno == ENOENT) {
       // Create the file
       std::cout << "Creating new serialized LSH database:" << filename << "...";
       std::cout.flush();
       serial_create(filename, serialFormat);
       dbIsNew=1;
-    }
-    else
+    } else {
       // The file can't be opened
       error("Can't open the file", filename, "open");
+    }
+  }
 
   // Load the on-disk header into core
   dbfid = serial_open(filename, 1); // open for write
   db = serial_mmap(dbfid, O2_SERIAL_HEADER_SIZE, 1);// get database pointer
   serial_get_header(db);           // read header

     for( y = 0 ;  y < H::N ; y++ ){
       // Move disk pointer to beginning of row
       pe=pt+y*lshHeader->numCols;
       
       colCount=0;
-      if(bucket* bPtr = h[x][y])
-	if(merge)
+      if(bucket* bPtr = h[x][y]) {
+	if(merge) {
 #ifdef LSH_LIST_HEAD_COUNTERS
 	  serial_merge_hashtable_row_format1(pe, bPtr->next, colCount); // skip collision counter bucket
-	else
+	} else {
 	  serial_write_hashtable_row_format1(pe, bPtr->next, colCount); // skip collision counter bucket
 #else
-      serial_merge_hashtable_row_format1(pe, bPtr, colCount);
-      else
-	serial_write_hashtable_row_format1(pe, bPtr, colCount);
-#endif
+          serial_merge_hashtable_row_format1(pe, bPtr, colCount);
+        } else {
+	  serial_write_hashtable_row_format1(pe, bPtr, colCount);
+#endif
+	}
+      }
       if(colCount){
 	if(colCount<minColCount)
 	  minColCount=colCount;
 	if(colCount>maxColCount)
 	  maxColCount=colCount;