Index: trunk/src/sh_audit.c
===================================================================
--- trunk/src/sh_audit.c	(revision 559)
+++ trunk/src/sh_audit.c	(revision 560)
@@ -75,5 +75,5 @@
 
   if (auparse_find_field(au, _("success")))
-    strncpy(state->success, auparse_interpret_field(au), REC_SIZE_SUCCESS);
+    sl_strlcpy(state->success, auparse_interpret_field(au), REC_SIZE_SUCCESS);
 
   if (auparse_find_field(au, "uid"))
Index: trunk/src/sh_dbIO.c
===================================================================
--- trunk/src/sh_dbIO.c	(revision 559)
+++ trunk/src/sh_dbIO.c	(revision 560)
@@ -227,10 +227,8 @@
     {
       /* alignment problem */
-      unsigned char swap;
-      static unsigned short ooop;
-      unsigned char * ii;
-      ooop = *iptr;
-      ii = (unsigned char *) &ooop;
-      swap = ii[0]; ii[0] = ii[1]; ii[1] = swap;
+      static unsigned short ooop = *iptr;
+      unsigned short hi   = (ooop & 0xff00);
+      unsigned short lo   = (ooop & 0xff);
+      ooop = (lo << 8) | (hi >> 8);
       return &ooop;
     }
Index: trunk/src/sh_filter.c
===================================================================
--- trunk/src/sh_filter.c	(revision 559)
+++ trunk/src/sh_filter.c	(revision 560)
@@ -115,4 +115,5 @@
   }
 
+  /* cppcheck-suppress uninitvar */
   i = *ntok;
   if (i == SH_FILT_NUM) {
Index: trunk/src/sh_ipvx.c
===================================================================
--- trunk/src/sh_ipvx.c	(revision 559)
+++ trunk/src/sh_ipvx.c	(revision 560)
@@ -201,4 +201,5 @@
   static char ipbuf[SH_IP_BUF];
 
+  memset(&ss, 0, sizeof(struct sh_sockaddr));
   sh_ipvx_save(&ss, sa_family, sa);
   sh_ipvx_ntoa (ipbuf, sizeof(ipbuf), &ss);
Index: trunk/src/sh_portcheck.c
===================================================================
--- trunk/src/sh_portcheck.c	(revision 559)
+++ trunk/src/sh_portcheck.c	(revision 560)
@@ -601,5 +601,5 @@
   struct sh_portentry * ptr = *head;
   struct sh_portentry * pre = *head;
-  char errbuf[256];
+  char errbuf[512];
 
   /* Take the address to keep gcc from putting them into registers. 
@@ -731,5 +731,5 @@
 {
   struct sh_portentry * portent;
-  char errbuf[256];
+  char errbuf[512];
 
   
Index: trunk/src/sh_srp.c
===================================================================
--- trunk/src/sh_srp.c	(revision 559)
+++ trunk/src/sh_srp.c	(revision 560)
@@ -119,5 +119,11 @@
 	    get_str_internal = ptr;
 	  else
-	    { free(get_str_internal); get_str_internal = NULL; }
+	    {
+	      /* "If realloc() fails, the original block is left untouched;
+	       * it is not freed or moved." */
+	      /* cppcheck-suppress doubleFree */
+	      free(get_str_internal);
+	      get_str_internal = NULL;
+	    }
 	}
       if (get_str_internal == NULL)
Index: trunk/src/sh_tiger1_64.c
===================================================================
--- trunk/src/sh_tiger1_64.c	(revision 559)
+++ trunk/src/sh_tiger1_64.c	(revision 560)
@@ -140,5 +140,5 @@
 #define roundend(a,b,c,x) \
  : "+r" (a), "+r" (b), "+r" (c) \
- : "r" (a), "r" (b), "r" (c), "m" (x), "r" (&tiger_table),\
+ : "g" (a), "g" (b), "g" (c), "m" (x), "r" (&tiger_table),\
   "i" (MASK0), "i" (MASK8), "i" (MASK16), "r" (MASK32), "r" (MASK40), "r" (MASK48) \
  : "3", "%rax","%rbx","%rcx","%rdx","%rsi", "%edi", "%r8"  );
Index: trunk/src/sh_utils.c
===================================================================
--- trunk/src/sh_utils.c	(revision 559)
+++ trunk/src/sh_utils.c	(revision 560)
@@ -827,4 +827,5 @@
     copy_four ( (unsigned char *) &(cc[i]), h1[i]);
 
+  /* cppcheck-suppress uninitvar */
   h2 = sh_tiger_hash_uint32 ( inner, TIGER_DATA,
 			      (unsigned long) KEY_BLOCK+textlen,
@@ -833,4 +834,5 @@
     copy_four ( (unsigned char *) &(cc[i]), h2[i - (KEY_LEN/8)]);
 
+  /* cppcheck-suppress uninitvar */
   SH_FREE(inner);
   
@@ -2201,4 +2203,5 @@
     SL_RETURN(NULL, _("sh_util_strconcat"));
 
+  /* cppcheck-suppress uninitvar */
   strnew[0] = '\0';