Changeset 22 for trunk/src/sh_tiger0.c

Timestamp:

Feb 23, 2006, 12:03:58 AM (19 years ago)

Author:

rainer

Message:

Minor code revisions.

File:

• trunk/src/sh_tiger0.c (modified) (3 diffs)

trunk/src/sh_tiger0.c

@@ -1392 +1392 @@
 }
 
-int sh_tiger_hashtype (char * c)
+int sh_tiger_hashtype (const char * c)
 {
   SL_ENTER( _("sh_tiger_hashtype"));
@@ -1460 +1460 @@
   if (res != NULL)
     {
-      /*@-bufferoverflowhigh -formatconst@*/
 #if defined(TIGER_64_BIT)
-      sprintf(out,                                   /* known to fit  */
-              MYFORMAT,
-              (sh_word32)(res[0]>>32), 
-              (sh_word32)(res[0]), 
-              (sh_word32)(res[1]>>32), 
-              (sh_word32)(res[1]), 
-              (sh_word32)(res[2]>>32), 
-              (sh_word32)(res[2]) );
+      sl_snprintf(out,
+                  sizeof(out),
+                  MYFORMAT,
+                  (sh_word32)(res[0]>>32), 
+                  (sh_word32)(res[0]), 
+                  (sh_word32)(res[1]>>32), 
+                  (sh_word32)(res[1]), 
+                  (sh_word32)(res[2]>>32), 
+                  (sh_word32)(res[2]) );
 #else
-      sprintf(out,                                   /* known to fit  */
-              MYFORMAT,
-              (sh_word32)(res[1]), 
-              (sh_word32)(res[0]), 
-              (sh_word32)(res[3]), 
-              (sh_word32)(res[2]), 
-              (sh_word32)(res[5]), 
-              (sh_word32)(res[4]) );
-#endif
-      /*@+bufferoverflowhigh@*/
-      out[KEY_LEN] = '\0';
+      sl_snprintf(out,
+                  sizeof(out),
+                  MYFORMAT,
+                  (sh_word32)(res[1]), 
+                  (sh_word32)(res[0]), 
+                  (sh_word32)(res[3]), 
+                  (sh_word32)(res[2]), 
+                  (sh_word32)(res[5]), 
+                  (sh_word32)(res[4]) );
+#endif
+      out[sizeof(out)-1] = '\0';
       SL_RETURN( out, _("sh_tiger_hash_internal"));
 
@@ -1507 +1507 @@
   if (res != NULL)
     {
-      /*@-bufferoverflowhigh -formatconst@*/
 #if defined(TIGER_64_BIT)
-      sprintf(outhash,                               /* known to fit  */
-              GPGFORMAT,
-              (sh_word32)(res[0]>>32), 
-              (sh_word32)(res[0]), 
-              (sh_word32)(res[1]>>32), 
-              (sh_word32)(res[1]), 
-              (sh_word32)(res[2]>>32), 
-              (sh_word32)(res[2]) );
+      sl_snprintf(outhash,
+                  sizeof(outhash),
+                  GPGFORMAT,
+                  (sh_word32)(res[0]>>32), 
+                  (sh_word32)(res[0]), 
+                  (sh_word32)(res[1]>>32), 
+                  (sh_word32)(res[1]), 
+                  (sh_word32)(res[2]>>32), 
+                  (sh_word32)(res[2]) );
 #else
-      sprintf(outhash,                               /* known to fit  */
-              GPGFORMAT,
-              (sh_word32)(res[1]), 
-              (sh_word32)(res[0]), 
-              (sh_word32)(res[3]), 
-              (sh_word32)(res[2]), 
-              (sh_word32)(res[5]), 
-              (sh_word32)(res[4]) );
-#endif
-      /*@+bufferoverflowhigh@*/
-      outhash[48 + 6] = '\0';
+      sl_snprintf(outhash,
+                  sizeof(outhash),
+                  GPGFORMAT,
+                  (sh_word32)(res[1]), 
+                  (sh_word32)(res[0]), 
+                  (sh_word32)(res[3]), 
+                  (sh_word32)(res[2]), 
+                  (sh_word32)(res[5]), 
+                  (sh_word32)(res[4]) );
+#endif
+      outhash[sizeof(outhash)-1] = '\0';
     }
   else
     {
-      /*@-bufferoverflowhigh@*/
-      sprintf(outhash,                               /* known to fit  */
-              _("00000000 00000000 00000000  00000000 00000000 00000000"));
-      /*@+bufferoverflowhigh@*/
+      sl_strlcpy(outhash,
+                 _("00000000 00000000 00000000  00000000 00000000 00000000"),
+                 sizeof(outhash));
     }