Merge /u/jrubio/cdesktopenv/ branch implicit-int into master

https://sourceforge.net/p/cdesktopenv/code/merge-requests/9/

diff --git a/cde/config/cf/DtInfo.tmpl b/cde/config/cf/DtInfo.tmpl
index b15e09ae6d34bc80a8389fef5485610e245af5fa..3a5eb05683747e4857809fc1e71f32dd9fb012c7 100644 (file)
--- a/cde/config/cf/DtInfo.tmpl
+++ b/cde/config/cf/DtInfo.tmpl
@@ -412,7 +412,7 @@ TEMPLATE_OBJS=TemplateDB//**/*.o
 
 #define TemplateObjs $(TEMPLATE_OBJS)
 
-#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture)
+#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture) || defined(AArch64Architecture)
 # define ByteOrderDefines LittleEndianDefines
 #elif defined(HAL32V7Architecture) || defined(SunArchitecture) || defined(AIXArchitecture) || defined(HPArchitecture)
 # define ByteOrderDefines BigEndianDefines

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?
             */
-           if (NULL != alignCharacters && '\0' != alignCharacters)
+           if (NULL != alignCharacters && '\0' != *alignCharacters)
              {
                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
                 */
-               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;
              }
          }

diff --git a/cde/lib/tt/mini_isam/isfname.c b/cde/lib/tt/mini_isam/isfname.c
index 4db5a265772d7c73da2b5b1cc9f351dfdf2fb3de..33ed70f8a3f6c4df8701aace2fa718cf9420af8f 100644 (file)
--- a/cde/lib/tt/mini_isam/isfname.c
+++ b/cde/lib/tt/mini_isam/isfname.c
@@ -111,7 +111,7 @@ _removelast(char *path)
 char *
 _lastelement(char *path)
 {
-    register   char    *p;
+    char       *p;
     
     p = path + strlen(path);
 

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;
      }
-     if ( string == '\0' ) {
+     if ( *string == '\0' ) {
           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);

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);
 
-       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);
 }
@@ -315,7 +315,7 @@ extern int
 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));
 }

diff --git a/cde/programs/dtksh/ksh93/src/cmd/pax/format.c b/cde/programs/dtksh/ksh93/src/cmd/pax/format.c
index 4ac96eab5f0d911b87438f6e936663325656a5dd..5422ac8b3549d5d45016d657e5e8a5c68c0b5058 100644 (file)
--- a/cde/programs/dtksh/ksh93/src/cmd/pax/format.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/pax/format.c
@@ -90,6 +90,11 @@
 #define __VA_START__(p,a)      va_start(p)
 #endif
 #endif
+
+#if defined(__linux__)
+#include <sys/sysmacros.h>
+#endif
+
 #include "pax.h"
 #include "options.h"
 

diff --git a/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c b/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c
index ac06fc143c87fd17ecc812a5ba86a5c8787cb36a..edffb0d197b008ef501cc58b6d96bd02b8bf4fa3 100644 (file)
--- a/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c
+++ b/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c
@@ -90,6 +90,11 @@
 #define __VA_START__(p,a)      va_start(p)
 #endif
 #endif
+
+#if defined(__linux__)
+#include <sys/sysmacros.h>
+#endif
+
 #include "pax.h"
 #include "options.h"
 

diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c
index b723e9d4c0fa7d68ef9b6418af2c0c5d616e650d..3ec25edc65150af93306b968d3af73e7edbc7a98 100644 (file)
--- a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c
@@ -90,10 +90,19 @@
 #define __VA_START__(p,a)      va_start(p)
 #endif
 #endif
+
+#if defined(__linux__)
+#include <sys/sysmacros.h>
+#endif
+
 #include <ast.h>
 #include <ctype.h>
 #include <ls.h>
 
+#if defined(__linux__)
+#include <sys/sysmacros.h>
+#endif
+
 char*
 fmtdev __PARAM__((struct stat* st), (st)) __OTORP__(struct stat* st;){
        unsigned int    ma = major(idevice(st));