Index: hl/c++/src/H5PacketTable.cpp
===================================================================
--- hl/c++/src/H5PacketTable.cpp	(revision 28262)
+++ hl/c++/src/H5PacketTable.cpp	(working copy)
@@ -34,7 +34,7 @@
      * Opens an existing packet table, which can contain either fixed-length or
      * variable-length packets.
      */
-    PacketTable::PacketTable(hid_t fileID, char* name)
+    PacketTable::PacketTable(hid_t fileID, const char* name)
     {
         table_id = H5PTopen( fileID, name);
     }
@@ -127,7 +127,7 @@
      * the packet table, the ID of the datatype of the set, and the size
      * of a memory chunk used in chunking.
      */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression)
+    FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize, int compression)
     {
         table_id = H5PTcreate_fl ( fileID, name, dtypeID, chunkSize, compression);
     }
@@ -136,7 +136,7 @@
      * Opens an existing fixed-length packet table.
      * Fails if the packet table specified is variable-length.
      */
-    FL_PacketTable::FL_PacketTable(hid_t fileID, char* name) : PacketTable(fileID, name)
+    FL_PacketTable::FL_PacketTable(hid_t fileID, const char* name) : PacketTable(fileID, name)
     {
 #ifdef VLPT_REMOVED
         if( H5PTis_varlen(table_id) != 0 )    // If this is not a fixed-length table
Index: hl/c++/src/H5PacketTable.h
===================================================================
--- hl/c++/src/H5PacketTable.h	(revision 28262)
+++ hl/c++/src/H5PacketTable.h	(working copy)
@@ -42,7 +42,7 @@
      * Opens an existing packet table, which can contain either fixed-length or
      * variable-length packets.
      */
-    PacketTable(hid_t fileID, char* name);
+    PacketTable(hid_t fileID, const char* name);
 
     /* Destructor
      * Cleans up the packet table
@@ -110,13 +110,13 @@
      * of a memory chunk used in chunking, and the desired compression level
      * (0-9, or -1 for no compression).
      */
-    FL_PacketTable(hid_t fileID, char* name, hid_t dtypeID, hsize_t chunkSize, int compression = -1);
+    FL_PacketTable(hid_t fileID, const char* name, hid_t dtypeID, hsize_t chunkSize, int compression = -1);
 
     /* "Open" Constructor
      * Opens an existing fixed-length packet table.
      * Fails if the packet table specified is variable-length.
      */
-    FL_PacketTable(hid_t fileID, char* name);
+    FL_PacketTable(hid_t fileID, const char* name);
 
     /* AppendPacket
      * Adds a single packet to the packet table.  Takes a pointer
Index: hl/src/H5TB.c
===================================================================
--- hl/src/H5TB.c	(revision 28262)
+++ hl/src/H5TB.c	(working copy)
@@ -2718,7 +2718,7 @@
             goto out;
 
         /* skip the field to delete */
-        if(!H5TB_find_field(member_name, field_name) > 0) {
+        if(!H5TB_find_field(member_name, field_name)) {
             /* get the member type */
             if((member_type_id = H5Tget_member_type(tid_1, (unsigned)i)) < 0)
                 goto out;
Index: tools/h5dump/h5dump_ddl.c
===================================================================
--- tools/h5dump/h5dump_ddl.c	(revision 28262)
+++ tools/h5dump/h5dump_ddl.c	(working copy)
@@ -1269,8 +1269,9 @@
         unsigned u;
 
         for (u = 0; u < type_table->nobjs; u++) {
-            if (!type_table->objs[u].recorded)
+            if (!type_table->objs[u].recorded) {
                 PRINTSTREAM(rawoutstream, " %-10s /#"H5_PRINTF_HADDR_FMT"\n", "datatype", type_table->objs[u].objno);
+            }
         }
     }
 
@@ -1874,8 +1875,9 @@
             begin_obj(h5tools_dump_header_format->softlinkbegin, links, h5tools_dump_header_format->softlinkblockbegin);
             PRINTVALSTREAM(rawoutstream, "\n");
             indentation(COL);
-            if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0)
+            if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0) {
                 PRINTSTREAM(rawoutstream, "LINKTARGET \"%s\"\n", buf);
+            }
             else {
                 error_msg("h5dump error: unable to get link value for \"%s\"\n", links);
                 h5tools_setstatus(EXIT_FAILURE);
Index: tools/h5dump/h5dump_defines.h
===================================================================
--- tools/h5dump/h5dump_defines.h	(revision 28262)
+++ tools/h5dump/h5dump_defines.h	(working copy)
@@ -23,23 +23,26 @@
 #define COL             3
 
 /* Macros for displaying objects */
-#define begin_obj(obj,name,begin)                               \
-    do {              \
-        if ((name))                                             \
+#define begin_obj(obj,name,begin)                                                \
+    do {                                                                         \
+        if ((name)) {                                                            \
             PRINTSTREAM(rawoutstream, "%s \"%s\" %s", (obj), (name), (begin));   \
-        else                                                    \
-            PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin));      \
+        } else {                                                                 \
+            PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin));                  \
+        }                                                                        \
     } while(0);
 
-#define end_obj(obj,end)                                        \
-    do {              \
-        if(HDstrlen(end)) {                                     \
-            PRINTSTREAM(rawoutstream, "%s", end);                                  \
-            if(HDstrlen(obj))                                   \
-                PRINTVALSTREAM(rawoutstream, " ");                                    \
-        }                                                       \
-        if(HDstrlen(obj))                                       \
-            PRINTSTREAM(rawoutstream, "%s", obj);                                  \
+#define end_obj(obj,end)                               \
+    do {                                               \
+        if(HDstrlen(end)) {                            \
+            PRINTSTREAM(rawoutstream, "%s", end);      \
+            if(HDstrlen(obj)) {                        \
+                PRINTVALSTREAM(rawoutstream, " ");     \
+            }                                          \
+        }                                              \
+        if(HDstrlen(obj)) {                            \
+            PRINTSTREAM(rawoutstream, "%s", obj);      \
+        }                                              \
     } while(0);
 
 
Index: tools/h5ls/h5ls.c
===================================================================
--- tools/h5ls/h5ls.c	(revision 28262)
+++ tools/h5ls/h5ls.c	(working copy)
@@ -2794,8 +2794,9 @@
             file = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, preferred_driver, drivername, sizeof drivername);
 
             if(file >= 0) {
-                if(verbose_g)
+                if(verbose_g) {
                     PRINTSTREAM(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername);
+                }
                 break; /*success*/
             } /* end if */
 
Index: tools/lib/h5tools_utils.c
===================================================================
--- tools/lib/h5tools_utils.c	(revision 28262)
+++ tools/lib/h5tools_utils.c	(working copy)
@@ -482,10 +482,11 @@
     unsigned u;
 
     PRINTSTREAM(rawoutstream,"%s: # of entries = %d\n", tablename,table->nobjs);
-    for (u = 0; u < table->nobjs; u++)
+    for (u = 0; u < table->nobjs; u++) {
         PRINTSTREAM(rawoutstream,"%a %s %d %d\n", table->objs[u].objno,
            table->objs[u].objname,
            table->objs[u].displayed, table->objs[u].recorded);
+    }
 }