From dbce2e4337f1a61563436f531741bf0145e6ad8b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 28 Oct 2019 13:22:09 -0600 Subject: [PATCH] DtSvc/DtUtil1: fix implicit function declarations --- cde/lib/DtSvc/DtUtil1/Action.c | 17 +++++++++++++++++ cde/lib/DtSvc/DtUtil1/ActionUtil.c | 4 ++++ cde/lib/DtSvc/DtUtil1/CmdMain.c | 3 +++ cde/lib/DtSvc/DtUtil1/DbLoad.c | 2 ++ cde/lib/DtSvc/DtUtil1/Dnd.c | 1 + cde/lib/DtSvc/DtUtil1/DndDrag.c | 9 +++++++++ cde/lib/DtSvc/DtUtil1/DndDrop.c | 8 ++++++++ cde/lib/DtSvc/DtUtil1/DtsDb.c | 5 ++++- cde/lib/DtSvc/DtUtil1/DtsInit.c | 4 +--- cde/lib/DtSvc/DtUtil1/DtsMM.c | 5 +++++ cde/lib/DtSvc/DtUtil1/DtsSort.c | 4 ++-- cde/lib/DtSvc/DtUtil1/MMDb.c | 6 +++++- cde/lib/DtSvc/DtUtil1/Saver.c | 5 +++-- cde/lib/DtSvc/DtUtil1/WmMarquee.c | 1 + cde/lib/DtSvc/DtUtil1/WmWsCallB.c | 1 + cde/lib/DtSvc/DtUtil1/inttab.c | 3 ++- 16 files changed, 68 insertions(+), 10 deletions(-) diff --git a/cde/lib/DtSvc/DtUtil1/Action.c b/cde/lib/DtSvc/DtUtil1/Action.c index a69918e9..0af24860 100644 --- a/cde/lib/DtSvc/DtUtil1/Action.c +++ b/cde/lib/DtSvc/DtUtil1/Action.c @@ -108,6 +108,23 @@ extern char * _DtStripSpaces( char * string) ; extern char * _DtDbPathIdToString( DtDbPathId pathId) ; +extern int _DtActDeleteChildRec( _DtActInvRecT *invp, _DtActChildRecT *childp); +extern int _DtActionCommandInvoke( + long wintype, + char * cwdHost, + char * cwdDir, + char * execString, + char * termOpts, + char * execHost, + char * procId, + char * tmpFiles, + void (*success_proc)(), + void *success_data, + void (*failure_proc)(), + void *failure_data); + + + #define _MAX_MAP_ATTEMPTS 100 /* Maximum nuber of "MAPS" that will be done. */ #define _DT_ACTION_MAX_CLOSE_TRIES 5 diff --git a/cde/lib/DtSvc/DtUtil1/ActionUtil.c b/cde/lib/DtSvc/DtUtil1/ActionUtil.c index 3a4c7667..5a8b7c46 100644 --- a/cde/lib/DtSvc/DtUtil1/ActionUtil.c +++ b/cde/lib/DtSvc/DtUtil1/ActionUtil.c @@ -94,6 +94,10 @@ static void _DtActFreeChildRec( _DtActChildRecT *childp); #ifndef P_tmpdir #define P_tmpdir "/var/tmp" #endif + +extern void _DtFreeRequest(ActionRequest *request ); + + /******************************************************************************* * _DtBasename -- utiltiy function to return a pointer to a * string containing the basename of a file name. It doesn't diff --git a/cde/lib/DtSvc/DtUtil1/CmdMain.c b/cde/lib/DtSvc/DtUtil1/CmdMain.c index 2635b961..67dfd9da 100644 --- a/cde/lib/DtSvc/DtUtil1/CmdMain.c +++ b/cde/lib/DtSvc/DtUtil1/CmdMain.c @@ -133,6 +133,9 @@ static int DtCmdGetWindowType( unsigned long windowTypeMask); static void _DtCmdInitializeErrorMessages(void); +extern void _DtEnvMapForRemote (char *targetHost); +extern void _DtEnvRestoreLocal (void); + /* * Command invocatin error messages. */ diff --git a/cde/lib/DtSvc/DtUtil1/DbLoad.c b/cde/lib/DtSvc/DtUtil1/DbLoad.c index f7187348..07caa4ee 100644 --- a/cde/lib/DtSvc/DtUtil1/DbLoad.c +++ b/cde/lib/DtSvc/DtUtil1/DbLoad.c @@ -103,6 +103,8 @@ extern void _DtDtsDAConverter(DtDtsDbField * fields, extern void _DtDtsSeqReset(void); extern int _DtDtsNextDCSeq(void); extern int _DtDtsNextDASeq(void); +extern int _DtDtsMMUnLoad(void); +extern void _DtFreeActionDB(void); char **_DtsDbListDb(void); diff --git a/cde/lib/DtSvc/DtUtil1/Dnd.c b/cde/lib/DtSvc/DtUtil1/Dnd.c index b8decc50..051c23aa 100644 --- a/cde/lib/DtSvc/DtUtil1/Dnd.c +++ b/cde/lib/DtSvc/DtUtil1/Dnd.c @@ -58,6 +58,7 @@ #include #include #include +#include #include
#include "Dnd.h" #include "DndP.h" diff --git a/cde/lib/DtSvc/DtUtil1/DndDrag.c b/cde/lib/DtSvc/DtUtil1/DndDrag.c index 10166ab2..9c26e22a 100644 --- a/cde/lib/DtSvc/DtUtil1/DndDrag.c +++ b/cde/lib/DtSvc/DtUtil1/DndDrag.c @@ -60,6 +60,7 @@ #include #include #include +#include
#include "Dnd.h" #include "DndP.h" #include "DtSvcLock.h" @@ -76,6 +77,14 @@ static void dndDragDropFinishCallback(Widget, XtPointer, XtPointer); static void dndTopLevelEnterCallback(Widget, XtPointer, XtPointer); static void dndTopLevelLeaveCallback(Widget, XtPointer, XtPointer); +extern int _DtDndCountVarArgs(va_list vaList); +extern void _DtDndArgListFromVarArgs(va_list vaList, + Cardinal maxArgs, + ArgList *argListReturn, + Cardinal *argCountReturn); +extern void _XmDragOverChange(Widget w, + unsigned char dropSiteStatus); + /* * Drag Initiator Resources */ diff --git a/cde/lib/DtSvc/DtUtil1/DndDrop.c b/cde/lib/DtSvc/DtUtil1/DndDrop.c index af8ae49d..32d3cee6 100644 --- a/cde/lib/DtSvc/DtUtil1/DndDrop.c +++ b/cde/lib/DtSvc/DtUtil1/DndDrop.c @@ -114,6 +114,14 @@ static XtResource dropResources[] = { XtRImmediate, (XtPointer)False }, }; +extern int _DtDndCountVarArgs(va_list vaList); +extern void _DtDndArgListFromVarArgs(va_list vaList, + Cardinal maxArgs, + ArgList *argListReturn, + Cardinal *argCountReturn); + + + #undef Offset /* diff --git a/cde/lib/DtSvc/DtUtil1/DtsDb.c b/cde/lib/DtSvc/DtUtil1/DtsDb.c index ba7c3086..51e97a86 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsDb.c +++ b/cde/lib/DtSvc/DtUtil1/DtsDb.c @@ -60,7 +60,10 @@ #include
#include "DtSvcLock.h" -extern char *strdup(const char *); +extern int _MMWriteDb(DtDirPaths *dirs, int num_db, DtDtsDbDatabase **db_list, + const char *CacheFile); + + #define PADMEM 10 diff --git a/cde/lib/DtSvc/DtUtil1/DtsInit.c b/cde/lib/DtSvc/DtUtil1/DtsInit.c index 7d67657f..0e385e27 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsInit.c +++ b/cde/lib/DtSvc/DtUtil1/DtsInit.c @@ -73,9 +73,7 @@ #include
#include "DtSvcLock.h" -#if !defined(__linux__) -extern char *strdup(const char *); -#endif +extern int _DtDtsMMUnLoad(void); static int cur_dc_count = 0; static int cur_da_count = 0; diff --git a/cde/lib/DtSvc/DtUtil1/DtsMM.c b/cde/lib/DtSvc/DtUtil1/DtsMM.c index 6892a180..8c5c2fcf 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsMM.c +++ b/cde/lib/DtSvc/DtUtil1/DtsMM.c @@ -65,6 +65,11 @@ static size_t mmaped_size = 0; static int mmaped_fd = 0; static DtDtsMMHeader *head = 0; +int _DtDtsMMUnLoad(void); + +extern void _DtDbFillVariables (char **line ); +extern void _DtDtsClear(void); + void * _DtDtsMMGetPtr(int index) { diff --git a/cde/lib/DtSvc/DtUtil1/DtsSort.c b/cde/lib/DtSvc/DtUtil1/DtsSort.c index 76f7dac9..5ed88803 100644 --- a/cde/lib/DtSvc/DtUtil1/DtsSort.c +++ b/cde/lib/DtSvc/DtUtil1/DtsSort.c @@ -219,7 +219,7 @@ bool(int i) #endif -check_content(char *val1, char *val2) +static int check_content(char *val1, char *val2) { char *v1 = strdup(val1); char *v2 = strdup(val2); @@ -462,7 +462,7 @@ cde_dc_field_compare(DtDtsDbField ** a, DtDtsDbField ** b) cde_ft_field_value((*b)->fieldName)); } -cde_da_compare(DtDtsDbRecord ** a, DtDtsDbRecord ** b) +int cde_da_compare(DtDtsDbRecord ** a, DtDtsDbRecord ** b) { int results = ((*a)->recordName) - ((*b)->recordName); diff --git a/cde/lib/DtSvc/DtUtil1/MMDb.c b/cde/lib/DtSvc/DtUtil1/MMDb.c index 1d3e5b52..84256438 100644 --- a/cde/lib/DtSvc/DtUtil1/MMDb.c +++ b/cde/lib/DtSvc/DtUtil1/MMDb.c @@ -77,6 +77,10 @@ static DtShmProtoIntList int_handle = 0; #define QtB(a) _DtShmProtoAddStrtab(shm_handle, XrmQuarkToString(a), &isnew) +/* DtsMM.c */ +extern int _DtDtsMMPathHash(DtDirPaths *dirs); + + int _MMWriteDb(DtDirPaths *dirs, int num_db, DtDtsDbDatabase **db_list, const char *CacheFile) @@ -724,7 +728,7 @@ write_db(DtDtsMMHeader *header, void *index, int size, const char *CacheFile) } -_DtActionCompareRecordBoson( +intptr_t _DtActionCompareRecordBoson( DtDtsMMRecord *record1, DtDtsMMRecord *record2 ) { diff --git a/cde/lib/DtSvc/DtUtil1/Saver.c b/cde/lib/DtSvc/DtUtil1/Saver.c index 5e7db00e..147ba0c4 100644 --- a/cde/lib/DtSvc/DtUtil1/Saver.c +++ b/cde/lib/DtSvc/DtUtil1/Saver.c @@ -54,6 +54,7 @@ #include #include #include +#include
#include "DtSvcLock.h" /* @@ -223,8 +224,8 @@ _DtSaverStart( /* * Launch saver. */ - DtActionInvoke(wAction, saverAction, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL); + DtActionInvoke(wAction, saverAction, NULL, 0, + NULL, NULL, NULL, 0, NULL, NULL); /* * Return array as state information. diff --git a/cde/lib/DtSvc/DtUtil1/WmMarquee.c b/cde/lib/DtSvc/DtUtil1/WmMarquee.c index 34751409..bf7e1608 100644 --- a/cde/lib/DtSvc/DtUtil1/WmMarquee.c +++ b/cde/lib/DtSvc/DtUtil1/WmMarquee.c @@ -44,6 +44,7 @@ #include #include
#include
+#include
#include "WsmP.h" #include
#include diff --git a/cde/lib/DtSvc/DtUtil1/WmWsCallB.c b/cde/lib/DtSvc/DtUtil1/WmWsCallB.c index 91f12dfd..f094a639 100644 --- a/cde/lib/DtSvc/DtUtil1/WmWsCallB.c +++ b/cde/lib/DtSvc/DtUtil1/WmWsCallB.c @@ -42,6 +42,7 @@ #include
#include
#include
+#include
#include "WsmP.h" #include "DtSvcLock.h" diff --git a/cde/lib/DtSvc/DtUtil1/inttab.c b/cde/lib/DtSvc/DtUtil1/inttab.c index bc1de38a..ab1296ac 100644 --- a/cde/lib/DtSvc/DtUtil1/inttab.c +++ b/cde/lib/DtSvc/DtUtil1/inttab.c @@ -99,7 +99,8 @@ _DtShmProtoInitInttab(int sizeguess) return((void*)ptr); } -_DtShmProtoAddInttab(DtShmProtoInttab intlist, unsigned int keyin, int datain) +int _DtShmProtoAddInttab(DtShmProtoInttab intlist, unsigned int keyin, + int datain) { intlist_t * ptr = (intlist_t *) intlist; int ** data; -- 2.25.1