Cleanup of -Wpointer-compare warnings.

diff --git a/cde/lib/DtHelp/Layout.c b/cde/lib/DtHelp/Layout.c
index 87028bb2c8a55ea2e393411220e226af89bd0886..6090c588605ad41e236452c3d30cc3b5edc81a5c 100644 (file)
--- a/cde/lib/DtHelp/Layout.c
+++ b/cde/lib/DtHelp/Layout.c
@@ -2379,7 +2379,7 @@ ProcessTable(
            /*
             * are any alignment characters specified?
             */
            /*
             * are any alignment characters specified?
             */

-           if (NULL != alignCharacters && '\0' != alignCharacters)
+           if (NULL != alignCharacters && '\0' != *alignCharacters)

              {
                int len = mblen(alignCharacters, MB_CUR_MAX);
 
              {
                int len = mblen(alignCharacters, MB_CUR_MAX);
 


@@ -3865,8 +3865,7 @@ ProcessContainer(
                 * check to see if the character is 'valid'.
                 * if not, default out of JUSTIFY_CHAR
                 */
                 * check to see if the character is 'valid'.
                 * if not, default out of JUSTIFY_CHAR
                 */

-               if (NULL != layout->info.align_char ||
-                                       '\0' == layout->info.align_char)
+               if ( (NULL != layout->info.align_char) && ( '\0' != *layout->info.align_char)) 

                    layout->txt_justify = _DtCvJUSTIFY_LEFT;
              }
          }
                    layout->txt_justify = _DtCvJUSTIFY_LEFT;
              }
          }

diff --git a/cde/programs/dtcm/dtcm/misc.c b/cde/programs/dtcm/dtcm/misc.c
index 1b8b18a8e071e516146736a71d2d1dffaf06c450..f598633bbb169a0da9a53db7acf4cc76840a5f2c 100644 (file)
--- a/cde/programs/dtcm/dtcm/misc.c
+++ b/cde/programs/dtcm/dtcm/misc.c
@@ -639,10 +639,11 @@ cm_mbchar(char *str) {
           free(buf);
           buf = NULL;
      }
           free(buf);
           buf = NULL;
      }

-     if ( string == '\0' ) {
+     if ( *string == '\0' ) {

           free(string_head);
           string_head = NULL;
           free(string_head);
           string_head = NULL;

-     } else {
+          string      = NULL;
+     } else if (string != NULL) {

           num_byte = mblen(string, MB_LEN_MAX);
           if(num_byte > 0) {
                buf = (char *)malloc(num_byte+1);
           num_byte = mblen(string, MB_LEN_MAX);
           if(num_byte > 0) {
                buf = (char *)malloc(num_byte+1);

diff --git a/cde/programs/dtcm/libDtCmP/props.c b/cde/programs/dtcm/libDtCmP/props.c
index 930a40c2a65e91361ccfb1b5dbc6756b2acd21a6..18ddbe940a8e2db3ad87323ab0af76c98e28bd9d 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/props.c
+++ b/cde/programs/dtcm/libDtCmP/props.c
@@ -269,7 +269,7 @@ extern char*
 get_char_prop(Props *p, Props_op op) {
        Props_entry     *step = p_get_props_entry(p, op);
 
 get_char_prop(Props *p, Props_op op) {
        Props_entry     *step = p_get_props_entry(p, op);
 

-       if (!step || !step->property_value || step->property_value == '\0')
+       if (!step || !step->property_value || *step->property_value == '\0')

                return get_char_prop_default(op);
        return (step->property_value);
 }
                return get_char_prop_default(op);
        return (step->property_value);
 }


@@ -315,7 +315,7 @@ extern int
 get_int_prop(Props *p, Props_op op) {
        Props_entry     *step = p_get_props_entry(p, op);
 
 get_int_prop(Props *p, Props_op op) {
        Props_entry     *step = p_get_props_entry(p, op);
 

-       if (!step || !step->property_value || step->property_value == '\0')
+       if (!step || !step->property_value || *step->property_value == '\0')

                return (atoi(get_char_prop_default(op)));
        return (atoi(step->property_value));
 }
                return (atoi(get_char_prop_default(op)));
        return (atoi(step->property_value));
 }