Changeset 1202 in Sophya for trunk/SophyaLib

Timestamp:

Sep 27, 2000, 5:56:51 PM (25 years ago)

Author:

ansari

Message:

bug swap md5

Location:

trunk/SophyaLib/BaseTools

Files:

• ppersist.cc (modified) (2 diffs)
• ppersist.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -174 +174 @@
   string typ_name = typeid(o).name() ;
   return (getDataObjClassId(typ_name) );
+}
+
+
+static inline void bswap8(void* p)
+{
+  uint_8 tmp = *(uint_8*)p;
+  *(uint_8*)p = ((tmp >> (7*8)) & 0x000000FF) | 
+                ((tmp >> (5*8)) & 0x0000FF00) |
+                ((tmp >> (3*8)) & 0x00FF0000) |
+                ((tmp >> (1*8)) & 0xFF000000) |
+                ((tmp & 0xFF000000) << (1*8))  |
+                ((tmp & 0x00FF0000) << (3*8))  |
+                ((tmp & 0x0000FF00) << (5*8))  |
+                ((tmp & 0x000000FF) << (7*8));
+}
+
+static inline void bswap4(void* p)
+{
+  uint_4 tmp = *(uint_4*)p;
+  *(uint_4*)p = ((tmp >> 24) & 0x000000FF) | 
+                ((tmp >> 8)  & 0x0000FF00) |
+                ((tmp & 0x0000FF00) << 8)  |
+                ((tmp & 0x000000FF) << 24);
+}
+
+static inline void bswap2(void* p)
+{
+  uint_2 tmp = *(uint_2*)p;
+  *(uint_2*)p = ((tmp >> 8) & 0x00FF) | 
+                ((tmp & 0x00FF) << 8);
+}
+
+
+uint_8 PIOPersist::Hash(string const& typname) { 
+        md5_init(&ctx); 
+        md5_write(&ctx, (unsigned char*) typname.c_str(), typname.size()); 
+        md5_final(&ctx); 
+        uint_8 hash1 =   *((uint_8*) ctx.buf);
+        uint_8 hash2 =   *((uint_8*) (ctx.buf+8));
+#if IS_BIG_ENDIAN
+        bswap8(&hash1);
+        bswap8(&hash2);
+#endif
+        
+        return (hash1+hash2);
 }
 
@@ -564 +609 @@
 //--
 
-
-static inline void bswap8(void* p)
-{
-  uint_8 tmp = *(uint_8*)p;
-  *(uint_8*)p = ((tmp >> (7*8)) & 0x000000FF) | 
-                ((tmp >> (5*8)) & 0x0000FF00) |
-                ((tmp >> (3*8)) & 0x00FF0000) |
-                ((tmp >> (1*8)) & 0xFF000000) |
-                ((tmp & 0xFF000000) << (1*8))  |
-                ((tmp & 0x00FF0000) << (3*8))  |
-                ((tmp & 0x0000FF00) << (5*8))  |
-                ((tmp & 0x000000FF) << (7*8));
-}
-
-static inline void bswap4(void* p)
-{
-  uint_4 tmp = *(uint_4*)p;
-  *(uint_4*)p = ((tmp >> 24) & 0x000000FF) | 
-                ((tmp >> 8)  & 0x0000FF00) |
-                ((tmp & 0x0000FF00) << 8)  |
-                ((tmp & 0x000000FF) << 24);
-}
-
-static inline void bswap2(void* p)
-{
-  uint_2 tmp = *(uint_2*)p;
-  *(uint_2*)p = ((tmp >> 8) & 0x00FF) | 
-                ((tmp & 0x00FF) << 8);
-}
 
 void

trunk/SophyaLib/BaseTools/ppersist.h

@@ -88 +88 @@
     static uint_8                getDataObjClassId(AnyDataObj const & o);
 
-    static uint_8 Hash(string const& typname) {
-        md5_init(&ctx);
-        md5_write(&ctx, (unsigned char*) typname.c_str(), typname.size());
-        md5_final(&ctx);
-        return ( *((uint_8*) ctx.buf) + *((uint_8*) (ctx.buf+8)));
-    }
+    static uint_8 Hash(string const& typname);
     static MD5_CONTEXT ctx;