From 75ea7be5207b064a9158acba20596974f59e9370 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 12 Dec 2021 12:29:48 -0700 Subject: [PATCH 1/5] DtSearch/raima: use autodetected byte endianness rather than forcing based on OS --- cde/lib/DtSearch/raima/Makefile.am | 8 ++++---- cde/lib/DtSearch/raima/dbswab.c | 2 +- cde/lib/DtSearch/raima/dbswab.h | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cde/lib/DtSearch/raima/Makefile.am b/cde/lib/DtSearch/raima/Makefile.am index a05e57518..ae0884af0 100644 --- a/cde/lib/DtSearch/raima/Makefile.am +++ b/cde/lib/DtSearch/raima/Makefile.am @@ -5,20 +5,20 @@ noinst_LTLIBRARIES = libraima.la libraima_la_LIBADD = -lc -lm libraima_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ - @DT_INCDIR@ \ + @DT_INCDIR@ -I$(top_srcdir)/include \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DNO_TRANS -DUNIX -D_POSIX_SOURCE -DMULTIBYTE if LINUX -libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700 +libraima_la_CFLAGS += -D_XOPEN_SOURCE=700 endif if BSD -libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=700 +libraima_la_CFLAGS += -D_XOPEN_SOURCE=700 endif if SOLARIS -libraima_la_CFLAGS += -DBYTE_SWAP -D_XOPEN_SOURCE=500 -DNO_REGCOMP +libraima_la_CFLAGS += -D_XOPEN_SOURCE=500 -DNO_REGCOMP endif if HPUX diff --git a/cde/lib/DtSearch/raima/dbswab.c b/cde/lib/DtSearch/raima/dbswab.c index 73a83f150..a059ba9e8 100644 --- a/cde/lib/DtSearch/raima/dbswab.c +++ b/cde/lib/DtSearch/raima/dbswab.c @@ -85,7 +85,7 @@ int debugging_key_swabs = FALSE; */ void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction) { -#ifndef BYTE_SWAP +#if defined(WORDS_BIGENDIAN) return; #else INT slotno; diff --git a/cde/lib/DtSearch/raima/dbswab.h b/cde/lib/DtSearch/raima/dbswab.h index 2e8d8b229..2e53d52e7 100644 --- a/cde/lib/DtSearch/raima/dbswab.h +++ b/cde/lib/DtSearch/raima/dbswab.h @@ -68,6 +68,7 @@ #include #include +#include /* Record number for OR_MISCREC DtSearch record */ #define MISCREC_RECNO 3 @@ -80,7 +81,7 @@ typedef enum {HTON=1, NTOH} SWABDIR; extern void swab_page (char *pgbuf, FILE_ENTRY *file_ptr, SWABDIR direction); -#ifdef BYTE_SWAP /* ie (BYTE_ORDER != BIG_ENDIAN) */ +#if !defined(WORDS_BIGENDIAN) /* ie (BYTE_ORDER != BIG_ENDIAN) */ #define HTONL(x) x = htonl(x) #define HTONS(x) x = htons(x) From ab409095d60031e3d654c4cbb94f3475cb7d3b68 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 12 Dec 2021 12:52:14 -0700 Subject: [PATCH 2/5] Fix a couple of unused-comparison clang warnings --- cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c | 2 +- cde/programs/dtcm/server/reclotick.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c index 700e3d493..43fcd5f27 100644 --- a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c +++ b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c @@ -1771,7 +1771,7 @@ populate_obj_menu( * Set the label of the menu items to be the names of the ABObj's */ for (i = 0, trav_open(&trav, parent, AB_TRAV_SALIENT_CHILDREN); - i < num_items_needed, (cur_obj = trav_next(&trav)) != NULL; ) + i < num_items_needed && (cur_obj = trav_next(&trav)) != NULL; ) { char *label; diff --git a/cde/programs/dtcm/server/reclotick.c b/cde/programs/dtcm/server/reclotick.c index 2aa203580..d1d7ddba2 100644 --- a/cde/programs/dtcm/server/reclotick.c +++ b/cde/programs/dtcm/server/reclotick.c @@ -141,7 +141,7 @@ ClosestTick( * to see if the duration needs to be updated. */ if (re->re_duration == RE_NOTSET) - (*res)->res_duration == RE_NOTSET; + (*res)->res_duration = RE_NOTSET; return closest_tick; } From a77253f9ced047d3dde3387140e414a025164fb8 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 12 Dec 2021 13:28:44 -0700 Subject: [PATCH 3/5] Fix a Wself-assign-field clang warning The arg that should be on the rhs seems to be commented out for some reason, and assigning a variable to itself is pointless, so just comment it out with a comment explaining why. --- cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C b/cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C index 561477304..4c1ba2341 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C +++ b/cde/programs/dtprintinfo/libUI/MotifUI/Dialog.C @@ -338,7 +338,11 @@ Dialog::Dialog(MotifUI *parent, char *title, char *base_directory, StringFree(pattern_string); if (help) { - _help_callback_data = _help_callback_data; + // JET - this does nothing - should probably be assigned from + // help_callback_data, but that argument seems to have been + // removed from the arg list (commented out for some reason). + // So, I'll just comment this out for now: + // _help_callback_data = _help_callback_data; XtAddCallback(_w, XmNhelpCallback, &Dialog::DialogCB, (XtPointer) this); } else From 4a0f9701ab816f90e0c7d73f2e5cb02fc6eae76f Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 12 Dec 2021 15:23:28 -0700 Subject: [PATCH 4/5] DtHelp: remove unused forced bit order depending on OS type --- cde/lib/DtHelp/Makefile.am | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am index c172b5845..1ac76b7bd 100644 --- a/cde/lib/DtHelp/Makefile.am +++ b/cde/lib/DtHelp/Makefile.am @@ -16,18 +16,9 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \ libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la $(LTLIBICONV) if SOLARIS -libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER libDtHelp_la_LIBADD += -lw -lgen -lm -lc endif -if LINUX -libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER -endif - -if BSD -libDtHelp_la_CFLAGS += -DLSB_BIT_ORDER -endif - libDtHelp_la_SOURCES = Actions.c AsciiSpc.c Callbacks.c \ Destroy.c Environ_c.c FileListUtils.c \ From a2d3491150cc8634a4c410b5f44afaa03f2acc57 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 12 Dec 2021 16:45:48 -0700 Subject: [PATCH 5/5] dtmailpr/Makefile.am: remove unsupported defines --- cde/programs/dtmail/dtmailpr/Makefile.am | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/cde/programs/dtmail/dtmailpr/Makefile.am b/cde/programs/dtmail/dtmailpr/Makefile.am index cbda4461a..bff12f16c 100644 --- a/cde/programs/dtmail/dtmailpr/Makefile.am +++ b/cde/programs/dtmail/dtmailpr/Makefile.am @@ -7,28 +7,4 @@ dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \ dtmailpr_LDADD = ../libDtMail/libDtMail.a $(DTCLIENTLIBS) $(XTOOLLIB) $(LTLIBICONV) -# FIXME - solaris -#if SOLARIS -# if SUNPRODIR -# SUNPRO_DIR = /opt/SUNWspro -# else -# SUNPRO_DIR = SUNPRODIR -#endif -#if I386 -# JET -- i386 is NOT big endian... -#dtmailpr_CXXFLAGS += -DBIG_ENDIAN -#endif -#if USE_SPRO_V3 -#dtmailpr_CXXFLAGS += -noex -USPRO_V2 -#if DEBUGTREE -#dtmailpr_CXXFLAGS += -xsb -#endif -#endif -# -#dtmailpr_CXXFLAGS += -L$(SUNPRO_DIR)/lib -xstrconst -Xc -v -DMMAP_NORESERVE \ -# -DSPRO_V2 +p +w -#dtmailpr_LDADD += -Bstatic -lC -Bdynamic -lc -Bstatic -ldl -lgen -lm -lw \ -# -lintl -lnsl -#endif - dtmailpr_SOURCES = main.C message.C mailbox.C utils.C