Обновить cde/debian/rules

trixie build fix

cde/configure.ac

@@ -617,6 +617,7 @@ lib/tt/bin/Makefile
 lib/tt/bin/shell/Makefile
 lib/tt/bin/ttauth/Makefile
 lib/tt/bin/scripts/Makefile
+lib/tt/bin/scripts/ttce2xdr
 lib/tt/bin/tttar/Makefile
 lib/tt/bin/tt_type_comp/Makefile
 lib/tt/bin/tttrace/Makefile

cde/debian/control

@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 10),
                libutempter-dev,
                libpam-dev,
                x11-xserver-utils,
-               libjpeg62-dev,
+               libjpeg62-turbo-dev,
                libssl-dev,
                tcl-dev,
                ksh,

cde/debian/rules

@@ -6,8 +6,8 @@
 
 #make clean cleans everything except the doc directory for some reason
 override_dh_auto_clean:
-	$(MAKE) clean
-	$(MAKE) clean.doc
+	#$(MAKE) clean
+	#$(MAKE) clean.doc
 
 #make World needs to be called, not just make
 override_dh_auto_build:

cde/include/Dt/Search.h

@@ -213,7 +213,7 @@ extern void	DtSearchFreeMessages (void);
 extern int	DtSearchGetMaxResults (void);
 extern void	DtSearchSetMaxResults (int new_max_results);
 extern char	*DtSearchFormatObjdate (DtSrObjdate objdate);
-extern void	DtSearchExit (int return_code);
+extern void	DtSearchExit (int return_code) __attribute__((noreturn));
 extern void	DtSearchAddUserExit (void (*user_exit)(int));
 extern void	DtSearchRemoveUserExit (void);
 

cde/include/Dt/ll.h

@@ -56,11 +56,11 @@ typedef struct {
 
 #define LLIST_INIT()    { POINTER_INIT(), POINTER_INIT(), NULL }
 
-BOOLEAN ll_access(P1(llist *));
-int ll_append(P1(llist *) Pi(CHAR_P *));
+BOOLEAN ll_access(llist *);
+int ll_append(llist *, CHAR_P *);
 #define ll_deaccess(ll)	    /**/
-CHAR_P *ll_first(P1(llist *));
-void ll_free(P1(llist *));
-CHAR_P *ll_next(P1(llist *));
-int ll_prepend(P1(llist *) Pi(CHAR_P *));
+CHAR_P *ll_first(llist *);
+void ll_free(llist *);
+CHAR_P *ll_next(llist *);
+int ll_prepend(llist *, CHAR_P *);
 /* vpp -nOS2 -dUNIX -nBSD -nVANILLA_BSD -nVMS -nMEMLOCK -nWINDOWS -nFAR_ALLOC -f/usr/users/master/config/nonwin ll.h */

cde/include/Dt/proto.h

@@ -263,7 +263,7 @@ char * get_element(char *, int);
 int renfiles(void);
 
 /* From startup.c: */
-int startup(DBN_FIX_D1 TASK_PTR_Di LOCK_Di);
+int startup(int);
 
 /* From taffcns.c: */
 int taf_open(void);

cde/include/Dt/task.h

@@ -255,132 +255,132 @@
 */
 
 
-int EXTERNAL_FIXED dt_opentask(P1(DB_TASK *));
-int EXTERNAL_FIXED dt_closetask(P1(DB_TASK));
+int EXTERNAL_FIXED dt_opentask(DB_TASK *);
+int EXTERNAL_FIXED dt_closetask(DB_TASK);
 
-int EXTERNAL_FIXED dt_close(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_DBN   dt_cmstat(P1(int) TASK_Di DBN_Dn);		/* cmstat.c */
-int EXTERNAL_DBN   dt_cmtype(P1(int) Pi(int *) TASK_Di DBN_Dn); 
+int EXTERNAL_FIXED dt_close(void);				/* dblfcns.c */
+int EXTERNAL_DBN   dt_cmstat(int, ...);		/* cmstat.c */
+int EXTERNAL_DBN   dt_cmtype(int, int *, ...); 
 								/* cmtype.c */
-int EXTERNAL_DBN   dt_connect(P1(int) TASK_Di DBN_Dn);		/* connect.c */
-int EXTERNAL_DBN   dt_cotype(P1(int) Pi(int *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_connect(int, ...);		/* connect.c */
+int EXTERNAL_DBN   dt_cotype(int, int *, ...); 
 								/* cotype.c */
-int EXTERNAL_DBN   dt_crget(P1(DB_ADDR *) TASK_Di DBN_Dn);	/* crget.c */
-int EXTERNAL_DBN   dt_crread(P1(long) Pi(char *) TASK_Di DBN_Dn);
+int EXTERNAL_DBN   dt_crget(DB_ADDR *, ...);	/* crget.c */
+int EXTERNAL_DBN   dt_crread(long, char *, ...);
 								/* crread.c */
-int EXTERNAL_DBN   dt_crset(P1(DB_ADDR *) TASK_Di DBN_Dn);	/* crset.c */
-int EXTERNAL_DBN   dt_crtype(P1(int *) TASK_Di DBN_Dn);	/* crtype.c */
-int EXTERNAL_DBN   dt_crwrite(P1(long) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_crset(DB_ADDR *, ...);	/* crset.c */
+int EXTERNAL_DBN   dt_crtype(int *, ...);	/* crtype.c */
+int EXTERNAL_DBN   dt_crwrite(long, char *, ...); 
 								/* crwrite.c */
-int EXTERNAL_DBN   dt_csmget(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csmget(int, DB_ADDR *, ...); 
 								/* csmget.c */
-int EXTERNAL_DBN   dt_csmread(P1(int) Pi(long) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csmread(int, long, char *, ...); 
 								/* csmread.c */
-int EXTERNAL_DBN   dt_csmset(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csmset(int, DB_ADDR *, ...); 
 								/* csmset.c */
-int EXTERNAL_DBN   dt_csmwrite(P1(int) Pi(long) Pi(const char *) TASK_Di 
-				  DBN_Dn); 			/* csmwrite.c */
-int EXTERNAL_DBN   dt_csoget(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csmwrite(int, long, const char *
+				, ...); 			/* csmwrite.c */
+int EXTERNAL_DBN   dt_csoget(int, DB_ADDR *, ...); 
 								/* csoget.c */
-int EXTERNAL_DBN   dt_csoread(P1(int) Pi(long) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csoread(int, long, char *, ...); 
 								/* csoread.c */
-int EXTERNAL_DBN   dt_csoset(P1(int) Pi(DB_ADDR *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csoset(int, DB_ADDR *, ...); 
 								/* csoset.c */
-int EXTERNAL_DBN   dt_csowrite(P1(int) Pi(long) Pi(const char *) TASK_Di 
-				  DBN_Dn); 			/* csowrite.c */
-int EXTERNAL_FIXED dt_ctbpath(P1(const char *) TASK_Di);	/* pathfcns.c */
-int EXTERNAL_FIXED dt_dbdpath(P1(const char *) TASK_Di );	/* dbdpath.c */
-int EXTERNAL_FIXED dt_dbfpath(P1(const char *) TASK_Di );	/* dbfpath.c */
-int EXTERNAL_FIXED dt_dblog(P1(const char *) TASK_Di );	/* dblog.c */
-int EXTERNAL_FIXED dt_dbuserid(P1(const char *) TASK_Di );	/* dbuserid.c */
-int EXTERNAL_DBN   dt_delete(TASK_D1 DBN_Dn);			/* delete.c */
-int EXTERNAL_DBN   dt_disdel(TASK_D1 DBN_Dn);			/* disdel.c */
-int EXTERNAL_DBN   dt_recnext(TASK_D1 DBN_Dn);			/* recnext.c */
-int EXTERNAL_DBN   dt_recprev(TASK_D1 DBN_Dn);			/* recprev.c */
-int EXTERNAL_FIXED dt_destroy(P1(const char *) TASK_Di );	/* destroy.c */
-int EXTERNAL_DBN   dt_discon(P1(int) TASK_Di DBN_Dn);		/* discon.c */
-int EXTERNAL_DBN   dt_fillnew(P1(int) Pi(const char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_csowrite(int, long, const char *
+				, ...); 			/* csowrite.c */
+int EXTERNAL_FIXED dt_ctbpath(const char *);	/* pathfcns.c */
+int EXTERNAL_FIXED dt_dbdpath(const char *);	/* dbdpath.c */
+int EXTERNAL_FIXED dt_dbfpath(const char *);	/* dbfpath.c */
+int EXTERNAL_FIXED dt_dblog(const char *);	/* dblog.c */
+int EXTERNAL_FIXED dt_dbuserid(const char *);	/* dbuserid.c */
+int EXTERNAL_DBN   dt_delete(void, ...);			/* delete.c */
+int EXTERNAL_DBN   dt_disdel(void, ...);			/* disdel.c */
+int EXTERNAL_DBN   dt_recnext(void, ...);			/* recnext.c */
+int EXTERNAL_DBN   dt_recprev(void, ...);			/* recprev.c */
+int EXTERNAL_FIXED dt_destroy(const char *);	/* destroy.c */
+int EXTERNAL_DBN   dt_discon(int, ...);		/* discon.c */
+int EXTERNAL_DBN   dt_fillnew(int, const char *, ...); 
 								/* fillnew.c */
-int EXTERNAL_DBN   dt_findco(P1(int) TASK_Di DBN_Dn);		/* findco.c */
-int EXTERNAL_DBN   dt_findfm(P1(int) TASK_Di DBN_Dn);		/* findfm.c */
-int EXTERNAL_DBN   dt_findlm(P1(int) TASK_Di DBN_Dn);		/* findlm.c */
-int EXTERNAL_DBN   dt_findnm(P1(int) TASK_Di DBN_Dn);		/* findnm.c */
-int EXTERNAL_DBN   dt_findpm(P1(int) TASK_Di DBN_Dn);		/* findpm.c */
-int EXTERNAL_FIXED dt_freeall(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_DBN   dt_initialize(TASK_D1 DBN_Dn);		/* initial.c */
-int EXTERNAL_DBN   dt_initfile(P1(FILE_NO) TASK_Di DBN_Dn);  	/* initial.c */
-int EXTERNAL_DBN   dt_ismember(P1(int) TASK_Di DBN_Dn);		/* ismember.c */
-int EXTERNAL_DBN   dt_isowner(P1(int) TASK_Di DBN_Dn);		/* isowner.c */
-int EXTERNAL_DBN   dt_keydel(P1(long) TASK_Di DBN_Dn);		/* keydel.c */
-int EXTERNAL_DBN   dt_keyexist(P1(long) TASK_Di DBN_Dn);	/* keyexist.c */
-int EXTERNAL_DBN   dt_keyfind(P1(long) Pi(const char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_findco(int, ...);		/* findco.c */
+int EXTERNAL_DBN   dt_findfm(int, ...);		/* findfm.c */
+int EXTERNAL_DBN   dt_findlm(int, ...);		/* findlm.c */
+int EXTERNAL_DBN   dt_findnm(int, ...);		/* findnm.c */
+int EXTERNAL_DBN   dt_findpm(int, ...);		/* findpm.c */
+int EXTERNAL_FIXED dt_freeall(void);				/* dblfcns.c */
+int EXTERNAL_DBN   dt_initialize(void, ...);		/* initial.c */
+int EXTERNAL_DBN   dt_initfile(FILE_NO, ...);  	/* initial.c */
+int EXTERNAL_DBN   dt_ismember(int, ...);		/* ismember.c */
+int EXTERNAL_DBN   dt_isowner(int, ...);		/* isowner.c */
+int EXTERNAL_DBN   dt_keydel(long, ...);		/* keydel.c */
+int EXTERNAL_DBN   dt_keyexist(long, ...);	/* keyexist.c */
+int EXTERNAL_DBN   dt_keyfind(long, const char *, ...); 
 								/* keyfind.c */
-int EXTERNAL_DBN   dt_keyfree(P1(long) TASK_Di DBN_Dn);		/* dblfcns.c */
-int EXTERNAL_DBN   dt_keyfrst(P1(long) TASK_Di DBN_Dn);		/* keyfrst.c */
-int EXTERNAL_DBN   dt_keylast(P1(long) TASK_Di DBN_Dn);		/* keylast.c */
-int EXTERNAL_DBN   dt_keylock(P1(long) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_keyfree(long, ...);		/* dblfcns.c */
+int EXTERNAL_DBN   dt_keyfrst(long, ...);		/* keyfrst.c */
+int EXTERNAL_DBN   dt_keylast(long, ...);		/* keylast.c */
+int EXTERNAL_DBN   dt_keylock(long, char *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_DBN   dt_keylstat(P1(long) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_keylstat(long, char *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_DBN   dt_keynext(P1(long) TASK_Di DBN_Dn);		/* keynext.c */
-int EXTERNAL_DBN   dt_keyprev(P1(long) TASK_Di DBN_Dn);		/* keyprev.c */
-int EXTERNAL_FIXED dt_keyread(P1(char *) TASK_Di );		/* keyfcns.c */
-int EXTERNAL_DBN   dt_keystore(P1(long) TASK_Di DBN_Dn);	/* keystore.c */
-int EXTERNAL_DBN   dt_lock(P1(int) Pi(LOCK_REQUEST *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_keynext(long, ...);		/* keynext.c */
+int EXTERNAL_DBN   dt_keyprev(long, ...);		/* keyprev.c */
+int EXTERNAL_FIXED dt_keyread(char *);		/* keyfcns.c */
+int EXTERNAL_DBN   dt_keystore(long, ...);	/* keystore.c */
+int EXTERNAL_DBN   dt_lock(int, LOCK_REQUEST *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_DBN   dt_makenew(P1(int) TASK_Di DBN_Dn);		/* makenew.c */
-int EXTERNAL_FIXED dt_mapchar(P1(unsigned char) Pi(unsigned char) 
-		      Pi(const char *) Pi(unsigned char) TASK_Di);
+int EXTERNAL_DBN   dt_makenew(int, ...);		/* makenew.c */
+int EXTERNAL_FIXED dt_mapchar(unsigned char, unsigned char 
+		, const char *, unsigned char);
 								/* mapchar.c */
-int EXTERNAL_DBN   dt_members(P1(int) Pi(LONG *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_members(int, LONG *, ...); 
 								/* members.c */
-int EXTERNAL_FIXED dt_off_opt(P1(int) TASK_Di );		/* options.c */
-int EXTERNAL_FIXED dt_on_opt(P1(int) TASK_Di );			/* options.c */
-int EXTERNAL_FIXED dt_open(P1(const char *) Pi(const char *) TASK_Di);
+int EXTERNAL_FIXED dt_off_opt(int);		/* options.c */
+int EXTERNAL_FIXED dt_on_opt(int);			/* options.c */
+int EXTERNAL_FIXED dt_open(const char *, const char *);
 								/* dblfcns.c */
-int EXTERNAL_FIXED dt_rdcurr(P1(DB_ADDR **) Pi(int *) TASK_Di); 
+int EXTERNAL_FIXED dt_rdcurr(DB_ADDR **, int *); 
 								/* rwcurr.c */
-int EXTERNAL_FIXED dt_rerdcurr(P1(DB_ADDR **) TASK_Di); 	/* rwcurr.c */
-int EXTERNAL_FIXED dt_wrcurr(P1(DB_ADDR *) TASK_Di);	/* rwcurr.c */
-int EXTERNAL_DBN   dt_recfree(P1(int) TASK_Di DBN_Dn);		/* dblfcns.c */
-int EXTERNAL_DBN   dt_recfrst(P1(int) TASK_Di DBN_Dn);		/* recfrst.c */
-int EXTERNAL_DBN   dt_reclast(P1(int) TASK_Di DBN_Dn);		/* reclast.c */
-int EXTERNAL_DBN   dt_reclock(P1(int) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_FIXED dt_rerdcurr(DB_ADDR **); 	/* rwcurr.c */
+int EXTERNAL_FIXED dt_wrcurr(DB_ADDR *);	/* rwcurr.c */
+int EXTERNAL_DBN   dt_recfree(int, ...);		/* dblfcns.c */
+int EXTERNAL_DBN   dt_recfrst(int, ...);		/* recfrst.c */
+int EXTERNAL_DBN   dt_reclast(int, ...);		/* reclast.c */
+int EXTERNAL_DBN   dt_reclock(int, char *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_DBN   dt_reclstat(P1(int) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_reclstat(int, char *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_FIXED dt_recover(P1(const char *) TASK_Di );	/* recover.c */
-int EXTERNAL_DBN   dt_recread(P1(char *) TASK_Di DBN_Dn);	/* recread.c */
-int EXTERNAL_DBN   dt_recset(P1(int) TASK_Di DBN_Dn);   	/* recset.c */
-int EXTERNAL_DBN   dt_recwrite(P1(const char *) TASK_Di DBN_Dn); 
+int EXTERNAL_FIXED dt_recover(const char *);	/* recover.c */
+int EXTERNAL_DBN   dt_recread(char *, ...);	/* recread.c */
+int EXTERNAL_DBN   dt_recset(int, ...);   	/* recset.c */
+int EXTERNAL_DBN   dt_recwrite(const char *, ...); 
 								/* recwrite.c */
-int EXTERNAL_FIXED dt_renfile(P1(const char *) Pi(FILE_NO) 
-				 Pi(const char *) TASK_Di); /* renfile.c */
-int EXTERNAL_FIXED dt_retries(P1(int) TASK_Di );		/* dblfcns.c */
-int EXTERNAL_FIXED dt_rlbclr(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_FIXED dt_rlbset(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_FIXED dt_rlbtst(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_FIXED dt_set_dberr(P1(FARPROC) TASK_Di);		/* dberr.c */
-int EXTERNAL_FIXED dt_setdb(P1(int) TASK_Di);			/* setdb.c */
-int EXTERNAL_DBN   dt_setfree(P1(int) TASK_Di DBN_Dn);		/* dblfcns.c */
-int EXTERNAL_DBN   dt_setkey(P1(long) Pi(const char *) TASK_Di DBN_Dn); 
+int EXTERNAL_FIXED dt_renfile(const char *, FILE_NO 
+				, const char *); /* renfile.c */
+int EXTERNAL_FIXED dt_retries(int);		/* dblfcns.c */
+int EXTERNAL_FIXED dt_rlbclr(void);				/* dblfcns.c */
+int EXTERNAL_FIXED dt_rlbset(void);				/* dblfcns.c */
+int EXTERNAL_FIXED dt_rlbtst(void);				/* dblfcns.c */
+int EXTERNAL_FIXED dt_set_dberr(FARPROC);		/* dberr.c */
+int EXTERNAL_FIXED dt_setdb(int);			/* setdb.c */
+int EXTERNAL_DBN   dt_setfree(int, ...);		/* dblfcns.c */
+int EXTERNAL_DBN   dt_setkey(long, const char *, ...); 
 								/* makenew.c */
-int EXTERNAL_DBN   dt_setlock(P1(int) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_setlock(int, char *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_DBN   dt_setlstat(P1(int) Pi(char *) TASK_Di DBN_Dn); 
+int EXTERNAL_DBN   dt_setlstat(int, char *, ...); 
 								/* dblfcns.c */
-int EXTERNAL_DBN   dt_setmm(P1(int) Pi(int) TASK_Di DBN_Dn); 	/* setmm.c */
-int EXTERNAL_DBN   dt_setmo(P1(int) Pi(int) TASK_Di DBN_Dn); 	/* setmo.c */
-int EXTERNAL_DBN   dt_setmr(P1(int) TASK_Di DBN_Dn);		/* setmr.c */
-int EXTERNAL_DBN   dt_setom(P1(int) Pi(int) TASK_Di DBN_Dn); 	/* setom.c */
-int EXTERNAL_DBN   dt_setoo(P1(int) Pi(int) TASK_Di DBN_Dn); 	/* setoo.c */
-int EXTERNAL_DBN   dt_setor(P1(int) TASK_Di DBN_Dn);		/* setor.c */
-int EXTERNAL_DBN   dt_setrm(P1(int) TASK_Di DBN_Dn);		/* setrm.c */
-int EXTERNAL_DBN   dt_setro(P1(int) TASK_Di DBN_Dn);		/* setro.c */
-int EXTERNAL_FIXED dt_timeout(P1(int) TASK_Di );		/* dblfcns.c */
-int EXTERNAL_FIXED dt_trabort(TASK_D1);				/* dblfcns.c */
-int EXTERNAL_FIXED dt_trbegin(P1(const char *) TASK_Di);	/* dblfcns.c */
-int EXTERNAL_FIXED dt_trend(TASK_D1);				/* dblfcns.c */
+int EXTERNAL_DBN   dt_setmm(int, int, ...); 	/* setmm.c */
+int EXTERNAL_DBN   dt_setmo(int, int, ...); 	/* setmo.c */
+int EXTERNAL_DBN   dt_setmr(int, ...);		/* setmr.c */
+int EXTERNAL_DBN   dt_setom(int, int, ...); 	/* setom.c */
+int EXTERNAL_DBN   dt_setoo(int, int, ...); 	/* setoo.c */
+int EXTERNAL_DBN   dt_setor(int, ...);		/* setor.c */
+int EXTERNAL_DBN   dt_setrm(int, ...);		/* setrm.c */
+int EXTERNAL_DBN   dt_setro(int, ...);		/* setro.c */
+int EXTERNAL_FIXED dt_timeout(int);		/* dblfcns.c */
+int EXTERNAL_FIXED dt_trabort(void);				/* dblfcns.c */
+int EXTERNAL_FIXED dt_trbegin(const char *);	/* dblfcns.c */
+int EXTERNAL_FIXED dt_trend(void);				/* dblfcns.c */
 
 #ifndef NO_DT_COVER
 

cde/include/Dt/vista.h

@@ -23,12 +23,9 @@
 /*
  *   COMPONENT_NAME: austext
  *
- *   FUNCTIONS: P1
+ *   FUNCTIONS:
  *              POINTER_ASSIGN
  *              POINTER_INIT
- *              Pi
- *              Piv
- *              Pv
  *              int
  *
  *   ORIGINS: 27,157
@@ -292,40 +289,9 @@ typedef struct {char *ptr; LOCK_DESC} CHAR_P;
 typedef struct {DB_ADDR *ptr; LOCK_DESC} DB_ADDR_P;
 
 
-/* Allow for function prototyping */
-#ifdef LINT_ARGS
-#define P0	void	/* parameterless function */
-#define P1(t)	t	/* first (or only) parameter in function */
-#define Pi(t)	,t	/* subsequent (2,3,...) parameter in function */
-#ifdef ANSI
-#define Piv(t)	,...	/* begining of variable number of parameters */
-#define Pv(t)	/**/	/* function has 0 or more parameters */
-#endif
-#else
-#define P0	/**/
-#define P1(t)	/**/
-#define Pi(t)	/**/
-#define Piv(t)	/**/
-#define Pv(t)	/**/
-#endif
-
-
-
-#define DBN_D1 Pv(int)
-#define DBN_FIX_D1 P1(int)
-#define DBN_Dn Piv(int)
-
-#define TASK_DBN_D1 DBN_D1
-#define TASK_D1 P0
-#define TASK_Di /**/
-#define TASK_PTR_D1 P0
-#define TASK_PTR_Di /**/
 #define CURRTASK_PARM            /**/
 #define CURRTASK_ONLY            /**/
 
-#define LOCK_D1 /**/
-#define LOCK_Di /**/
-
 typedef struct {
    int  item;  /* record or set number */
    char type;  /* lock type: 'r', 'w', 'x', 'k' */

cde/lib/DtHelp/FormatSDL.c

@@ -8732,7 +8732,7 @@ FormatSDLTitle(
  * Purpose:
  *
  ******************************************************************************/
-static	int
+static	void
 SetGhostLink(
     _DtCvLinkDb		 link_data,
     _DtCvSegment	*segments,

cde/lib/DtHelp/Graphics.c

@@ -2916,6 +2916,7 @@ size_t _DtGrRead(
                 return (num_items);
         }
     }
+    return 0;
 }
 
 /******************************************************************************
@@ -2969,6 +2970,7 @@ int _DtGrSeek(
         else
             return(-1); /* Failure */
     }
+    return -1;
 }
 
 /******************************************************************************
@@ -2997,6 +2999,7 @@ int _DtGrGetChar(
         else
 	    return ((unsigned char) *(stream->source.buffer.current++));
     }
+    return EOF;
 }
 
 /******************************************************************************
@@ -3058,4 +3061,5 @@ char *_DtGrGetString(
         *buffer = '\0';
         return (save);
     }
+    return NULL;
 }

cde/lib/DtHelp/HelpDialog.c

@@ -1957,7 +1957,7 @@ void _DtHelpSetupDisplayType(
          {
             /* Update the History and Jump Lists */
 
-            if (updateType == DtHISTORY_AND_JUMP)
+            if (updateType == DtHISTORY_AND_JUMP) {
               _DtHelpUpdateJumpList(hw->help_dialog.display.manPage,
                                  DtHELP_TYPE_MAN_PAGE, (Widget)hw);
     
@@ -1966,6 +1966,7 @@ void _DtHelpSetupDisplayType(
               _DtHelpDisplayAreaSetList (hw->help_dialog.help.pDisplayArea,
                                       topicHandle, FALSE, 
                                       hw->help_dialog.backtr.scrollPosition);
+	    }
           }
         else
           {

cde/lib/DtHelp/Selection.c

@@ -379,7 +379,7 @@ SkipOtherLines(
  * Function: CheckAndSwitchPoints
  *
  *****************************************************************************/
-static int
+static void
 CheckAndSwitchPoints(
     _DtCvSelectData *pt1,
     _DtCvSelectData *pt2)

cde/lib/DtHelp/il/ilpipe.c

@@ -1364,4 +1364,5 @@ ilError                 error;
 
             }   /* END while true: execute strips */
         }       /* END switch pipe state */
+    return IL_EXECUTE_AGAIN;
 }

cde/lib/DtHelp/il/ilxpm.h

@@ -1,251 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/* $XConsortium: ilxpm.h /main/4 1995/10/23 16:03:21 rswiston $ */
-/* Copyright 1990,91 GROUPE BULL -- See licence conditions in file COPYRIGHT */
-/*****************************************************************************\
-* xpm.h:                                                                      *
-*                                                                             *
-*  XPM library                                                                *
-*  Include file                                                               *
-*                                                                             *
-*  Developed by Arnaud Le Hors                                                *
-\*****************************************************************************/
-
-#ifndef XPM_h
-#define XPM_h
-
-
-#ifdef VMS
-/*
-#include "decw$include:Xlib.h"
-#include "decw$include:Intrinsic.h" 
-*/
-#include "sys$library:stdio.h"
-#else 
-/*
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
-*/
-#include <stdio.h>
-#endif
-
-
-/* we keep the same codes as for Bitmap management */
-/*
-#ifndef _XUTIL_H_
-#ifdef VMS
-#include "decw$include:Xutil.h"
-#else
-#include <X11/Xutil.h>
-#endif
-#endif
-*/
-/* Return ErrorStatus codes:
- * null     if full success
- * positive if partial success
- * negative if failure
- */
-
-#define XpmColorError    1
-#define XpmSuccess       0
-#define XpmOpenFailed   -1
-#define XpmFileInvalid  -2
-#define XpmNoMemory     -3
-#define XpmColorFailed  -4
-
-
-typedef struct {
-    char *name;				/* Symbolic color name */
-    char *value;			/* Color value */
-/*    Pixel pixel;			/* Color pixel */ 
-}      XpmColorSymbol;
-
-typedef struct {
-    unsigned long valuemask;		/* Specifies which attributes are
-					 * defined */
-
-/*    Visual *visual;			/* Specifies the visual to use */
-/*    Colormap colormap;			/* Specifies the colormap to use */
-    unsigned int depth;			/* Specifies the depth */
-    unsigned int width;			/* Returns the width of the created
-					 * pixmap */
-    unsigned int height;		/* Returns the height of the created
-					 * pixmap */
-    unsigned int x_hotspot;		/* Returns the x hotspot's
-					 * coordinate */
-    unsigned int y_hotspot;		/* Returns the y hotspot's
-					 * coordinate */
-    unsigned int cpp;			/* Specifies the number of char per
-					 * pixel */
-/*    Pixel *pixels;			/* List of used color pixels */
-    unsigned int npixels;		/* Number of pixels */
-    XpmColorSymbol *colorsymbols;	/* Array of color symbols to
-					 * override */
-    unsigned int numsymbols;		/* Number of symbols */
-    char *rgb_fname;			/* RGB text file name */
-
-    /* Infos */
-    unsigned int ncolors;		/* Number of colors */
-    char ***colorTable;			/* Color table pointer */
-    char *hints_cmt;			/* Comment of the hints section */
-    char *colors_cmt;			/* Comment of the colors section */
-    char *pixels_cmt;			/* Comment of the pixels section */
-    unsigned int mask_pixel;		/* Transparent pixel's color table
-					 * index */
-
-}      XpmAttributes;
-
-/* Xpm attribute value masks bits */
-#define XpmVisual	   (1L<<0)
-#define XpmColormap	   (1L<<1)
-#define XpmDepth	   (1L<<2)
-#define XpmSize		   (1L<<3)	/* width & height */
-#define XpmHotspot	   (1L<<4)	/* x_hotspot & y_hotspot */
-#define XpmCharsPerPixel   (1L<<5)
-#define XpmColorSymbols	   (1L<<6)
-#define XpmRgbFilename	   (1L<<7)
-#define XpmInfos	   (1L<<8)	/* all infos members */
-
-#define XpmReturnPixels	   (1L<<9)
-#define XpmReturnInfos	   XpmInfos
-
-/*
- * minimal portability layer between ansi and KR C 
- */
-
-/* forward declaration of functions with prototypes */
-
-#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
- /* ANSI || C++ */
-#define FUNC(f, t, p) extern t f p
-#define LFUNC(f, t, p) static t f p
-#else					/* K&R */
-#define FUNC(f, t, p) extern t f()
-#define LFUNC(f, t, p) static t f()
-#endif					/* end of K&R */
-
-
-/*
- * functions declarations
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-    FUNC(XpmCreatePixmapFromData, int, (Display * display,
-					Drawable d,
-					char **data,
-					Pixmap * pixmap_return,
-					Pixmap * shapemask_return,
-					XpmAttributes * attributes));
-
-    FUNC(XpmCreateDataFromPixmap, int, (Display * display,
-					char ***data_return,
-					Pixmap pixmap,
-					Pixmap shapemask,
-					XpmAttributes * attributes));
-
-    FUNC(XpmReadFileToPixmap, int, (Display * display,
-				    Drawable d,
-				    char *filename,
-				    Pixmap * pixmap_return,
-				    Pixmap * shapemask_return,
-				    XpmAttributes * attributes));
-
-    FUNC(XpmWriteFileFromPixmap, int, (Display * display,
-				       char *filename,
-				       Pixmap pixmap,
-				       Pixmap shapemask,
-				       XpmAttributes * attributes));
-
-    FUNC(XpmCreateImageFromData, int, (Display * display,
-				       char **data,
-				       XImage ** image_return,
-				       XImage ** shapemask_return,
-				       XpmAttributes * attributes));
-
-    FUNC(XpmCreateDataFromImage, int, (Display * display,
-				       char ***data_return,
-				       XImage * image,
-				       XImage * shapeimage,
-				       XpmAttributes * attributes));
-
-    FUNC(XpmReadFileToImage, int, (Display * display,
-				   char *filename,
-				   XImage ** image_return,
-				   XImage ** shapeimage_return,
-				   XpmAttributes * attributes));
-
-    FUNC(XpmWriteFileFromImage, int, (Display * display,
-				      char *filename,
-				      XImage * image,
-				      XImage * shapeimage,
-				      XpmAttributes * attributes));
- */
-
-    FUNC(XpmAttributesSize, int, ());
-    FUNC(XpmFreeAttributes, int, (XpmAttributes * attributes));
-
-#ifdef __cplusplus
-}					/* for C++ V2.0 */
-
-#endif
-
-
-/* bakward compatibility */
-
-/* for version 3.0c */
-#define XpmPixmapColorError  XpmColorError
-#define XpmPixmapSuccess     XpmSuccess
-#define XpmPixmapOpenFailed  XpmOpenFailed
-#define XpmPixmapFileInvalid XpmFileInvalid
-#define XpmPixmapNoMemory    XpmNoMemory
-#define XpmPixmapColorFailed XpmColorFailed
-
-#define XpmReadPixmapFile(dpy, d, file, pix, mask, att) \
-    XpmReadFileToPixmap(dpy, d, file, pix, mask, att)
-#define XpmWritePixmapFile(dpy, file, pix, mask, att) \
-    XpmWriteFileFromPixmap(dpy, file, pix, mask, att)
-
-/* for version 3.0b */
-#define PixmapColorError  XpmColorError
-#define PixmapSuccess     XpmSuccess
-#define PixmapOpenFailed  XpmOpenFailed
-#define PixmapFileInvalid XpmFileInvalid
-#define PixmapNoMemory    XpmNoMemory
-#define PixmapColorFailed XpmColorFailed
-
-#define ColorSymbol XpmColorSymbol
-
-#define XReadPixmapFile(dpy, d, file, pix, mask, att) \
-    XpmReadFileToPixmap(dpy, d, file, pix, mask, att)
-#define XWritePixmapFile(dpy, file, pix, mask, att) \
-    XpmWriteFileFromPixmap(dpy, file, pix, mask, att)
-#define XCreatePixmapFromData(dpy, d, data, pix, mask, att) \
-    XpmCreatePixmapFromData(dpy, d, data, pix, mask, att)
-#define XCreateDataFromPixmap(dpy, data, pix, mask, att) \
-    XpmCreateDataFromPixmap(dpy, data, pix, mask, att)
-
-#endif

cde/lib/DtHelp/il/ilxpmP.h

@@ -1,269 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/* $XConsortium: ilxpmP.h /main/4 1995/10/23 16:03:34 rswiston $ */
-/* Copyright 1990,91 GROUPE BULL -- See licence conditions in file COPYRIGHT */
-/*****************************************************************************\
-* xpmP.h:                                                                     *
-*                                                                             *
-*  XPM library                                                                *
-*  Private Include file                                                       *
-*                                                                             *
-*  Developed by Arnaud Le Hors                                                *
-\*****************************************************************************/
-
-#ifndef XPMP_h
-#define XPMP_h
-
-#ifdef Debug
-/* memory leak control tool */
-#include <mnemosyne.h>
-#endif
-
-/*
-#ifdef VMS
-#include "decw$include:Xlib.h"
-#include "decw$include:Intrinsic.h"
-#include "sys$library:stdio.h"
-#else
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
-#include <stdio.h>
-#endif
-*/
-
-#include "ilxpm.h"
-#ifndef IL_H
-#include "il.h"
-#endif
-
-/* we keep the same codes as for Bitmap management */
-/*
-#ifndef _XUTIL_H_
-#ifdef VMS
-#include "decw$include:Xutil.h"
-#else
-#include <X11/Xutil.h>
-#endif
-#endif
-*/
-
-
-typedef struct {
-    unsigned int type;
-    union {
-	FILE *file;
-	char **data;
-    }     stream;
-    char *cptr;
-    unsigned int line;
-    int CommentLength;
-    char Comment[BUFSIZ];
-    char *Bcmt, *Ecmt, Bos, Eos;
-    unsigned int InsideString;		/* used during parsing: 0 or 1
-					 * whether we are inside or not */
-}      xpmData;
-
-#define XPMARRAY 0
-#define XPMFILE  1
-#define XPMPIPE  2
-
-typedef unsigned char byte;
-
-#define EOL '\n'
-#define TAB '\t'
-#define SPC ' '
-
-typedef struct {
-    char *type;				/* key word */
-    char *Bcmt;				/* string begining comments */
-    char *Ecmt;				/* string ending comments */
-    char Bos;				/* character begining strings */
-    char Eos;				/* character ending strings */
-    char *Strs;				/* strings separator */
-    char *Dec;				/* data declaration string */
-    char *Boa;				/* string begining assignment */
-    char *Eoa;				/* string ending assignment */
-}      xpmDataType;
-
-extern xpmDataType xpmDataTypes[];
-
-/*
- * rgb values and ascii names (from rgb text file) rgb values,
- * range of 0 -> 65535 color mnemonic of rgb value
- */
-typedef struct {
-    int r, g, b;
-    char *name;
-}      xpmRgbName;
-
-/* Maximum number of rgb mnemonics allowed in rgb text file. */
-#define MAX_RGBNAMES 1024
-
-extern char *xpmColorKeys[];
-
-#define TRANSPARENT_COLOR "None"	/* this must be a string! */
-
-/* number of xpmColorKeys */
-#define NKEYS 5
-
-/*
- * key numbers for visual type, they must fit along with the number key of
- * each corresponding element in xpmColorKeys[] defined in xpm.h
- */
-#define MONO	2
-#define GRAY4	3
-#define GRAY 	4
-#define COLOR	5
-
-/* structure containing data related to an Xpm pixmap */
-typedef struct {
-    char *name;
-    unsigned int width;
-    unsigned int height;
-    unsigned int cpp;
-    unsigned int ncolors;
-    char ***colorTable;
-    unsigned int *pixelindex;
-/*    XColor *xcolors;  */
-    char **colorStrings;
-    unsigned int mask_pixel;		/* mask pixel's colorTable index */
-    unsigned short     *pPalette;       /* color palette derived for xpm Image */
-    short       nPaletteColors;         /* current entry count in palette */
-}      xpmInternAttrib;
-
-#define UNDEF_PIXEL 0x80000000
-
-/* XPM private routines */
-
-FUNC(xpmCreateImage, int, (ilObject      object,
-			   xpmInternAttrib * attrib,
-			   ilClientImage * image_return,
-			   ilClientImage * shapeimage_return,
-			   XpmAttributes * attributes));
-
-FUNC(xpmParseData, int, (xpmData * data,
-			 xpmInternAttrib * attrib_return,
-			 XpmAttributes * attributes));
-
-/* 
-FUNC(xpmScanImage, int, (Display * display,
-			 XImage * image,
-			 XImage * shapeimage,
-			 XpmAttributes * attributes,
-			 xpmInternAttrib * attrib));
-
-FUNC(xpmVisualType, int, (Visual * visual));
-*/
-
-FUNC(xpmFreeColorTable, int, (char ***colorTable, int ncolors));
-
-FUNC(xpmInitInternAttrib, int, (xpmInternAttrib * coedata));
-
-FUNC(xpmFreeInternAttrib, int, (xpmInternAttrib * coedata));
-
-FUNC(xpmSetAttributes, int, (xpmInternAttrib * attrib,
-			     XpmAttributes * attributes));
-
-FUNC(xpmGetAttributes, int, (XpmAttributes * attributes,
-			     xpmInternAttrib * attrib));
-
-/* I/O utility */
-
-FUNC(xpmNextString, int, (xpmData * mdata));
-FUNC(xpmNextUI, int, (xpmData * mdata, unsigned int *ui_return));
-FUNC(xpmGetC, int, (xpmData * mdata));
-FUNC(xpmUngetC, int, (int c, xpmData * mdata));
-FUNC(xpmNextWord, unsigned int, (xpmData * mdata, char *buf));
-FUNC(xpmGetCmt, int, (xpmData * mdata, char **cmt));
-FUNC(xpmReadFile, int, (char *filename, xpmData * mdata));
-FUNC(xpmWriteFile, int, (char *filename, xpmData * mdata));
-FUNC(xpmOpenArray, int, (char **data, xpmData * mdata));
-FUNC(XpmDataClose, int, (xpmData * mdata));
-
-/* RGB utility */
- 
-/*
-FUNC(xpmReadRgbNames, int, (char *rgb_fname, xpmRgbName * rgbn));
-FUNC(xpmGetRgbName, char *, (xpmRgbName * rgbn, int rgbn_max,
-			     int red, int green, int blue));
-FUNC(xpmFreeRgbNames, void, (xpmRgbName * rgbn, int rgbn_max));
-
-FUNC(xpm_xynormalizeimagebits, int, (unsigned char *bp,
-				     XImage * img));
-FUNC(xpm_znormalizeimagebits, int, (unsigned char *bp,
-				    XImage * img));
-*/
-/*
- * Macros
- * 
- * The XYNORMALIZE macro determines whether XY format data requires 
- * normalization and calls a routine to do so if needed. The logic in
- * this module is designed for LSBFirst byte and bit order, so 
- * normalization is done as required to present the data in this order.
- *
- * The ZNORMALIZE macro performs byte and nibble order normalization if 
- * required for Z format data.
- * 
- * The XYINDEX macro computes the index to the starting byte (char) boundary
- * for a bitmap_unit containing a pixel with coordinates x and y for image
- * data in XY format.
- * 
- * The ZINDEX* macros compute the index to the starting byte (char) boundary 
- * for a pixel with coordinates x and y for image data in ZPixmap format.
- * 
- */
-
-/*
-#define XYNORMALIZE(bp, img) \
-    if ((img->byte_order == MSBFirst) || (img->bitmap_bit_order == MSBFirst)) \
-	xpm_xynormalizeimagebits((unsigned char *)(bp), img)
-
-#define ZNORMALIZE(bp, img) \
-    if (img->byte_order == MSBFirst) \
-	xpm_znormalizeimagebits((unsigned char *)(bp), img)
-
-#define XYINDEX(x, y, img) \
-    ((y) * img->bytes_per_line) + \
-    (((x) + img->xoffset) / img->bitmap_unit) * (img->bitmap_unit >> 3)
-
-#define ZINDEX(x, y, img) ((y) * img->bytes_per_line) + \
-    (((x) * img->bits_per_pixel) >> 3)
-
-#define ZINDEX32(x, y, img) ((y) * img->bytes_per_line) + ((x) << 2)
-
-#define ZINDEX16(x, y, img) ((y) * img->bytes_per_line) + ((x) << 1)
-
-#define ZINDEX8(x, y, img) ((y) * img->bytes_per_line) + (x)
-
-#define ZINDEX1(x, y, img) ((y) * img->bytes_per_line) + ((x) >> 3)
-
-*/
-
-
-#if defined(__STDC__)
-#define Const const
-#else
-#define Const				/**/
-#endif
-
-#endif

cde/lib/DtSearch/ausexit.c

@@ -111,6 +111,7 @@ void	(*austext_exit_last) (int) =	NULL;
 /*		DtSearchExit		*/
 /*					*/
 /****************************************/
+__attribute__((noreturn))
 void	DtSearchExit (int return_code)
 {
     if (austext_exit_first != NULL)

cde/lib/DtSearch/dtsrjoint.c

@@ -579,11 +579,9 @@ static DtSrResult *ditto_sort (DtSrResult * lst)
 	    return merge_by_prox (ditto_sort (lst), ditto_sort (lst2));
 	case DtSrSORT_DATE:
 	    return merge_by_date (ditto_sort (lst), ditto_sort (lst2));
-	default:
-	    fprintf (aa_stderr, PROGNAME "525 Invalid Sort Type %d.\n",
-		ditsort_type);
-	    DtSearchExit (32);
     }
+    fprintf (aa_stderr, PROGNAME "525 Invalid Sort Type %d.\n", ditsort_type);
+    DtSearchExit (32);
 }  /* ditto_sort() */
 
 

cde/lib/DtSearch/raima/alloc.c

@@ -114,7 +114,7 @@ void d_free(CHAR_P *p)
 }
 
 
-static int NewInit(P1(LL_P *));
+static int NewInit(LL_P *);
 
 /* Resets pointer to current element and checks for an empty list
 */

cde/lib/DtSearch/raima/connect.c

@@ -50,8 +50,7 @@
 #include "dbtype.h"
 
 /* Internal function Prototypes */
-static int sortcmp(P1(SET_ENTRY *) Pi(char *) 
-				  Pi(char *));
+static int sortcmp(SET_ENTRY *, char *, char *);
 
 /* set pointer structure definition */
 typedef struct {

cde/lib/DtSearch/raima/keyfind.c

@@ -51,8 +51,7 @@
 #include "dbtype.h"
 
 /* Internal function prototypes */
-static void chk_desc_key(P1(int) Pi(FIELD_ENTRY *) 
-					Pi(const char *) Pi(char *));
+static void chk_desc_key(int, FIELD_ENTRY *, const char *, char *);
 
 /* Find record thru key field
 */

cde/lib/DtSearch/raima/libfcns.c

@@ -63,10 +63,8 @@
 #include "dbtype.h"
 
 /* Internal function prototypes */
-static int rec_okay(P1(int) Pi(int *) 
-				   Pi(RECORD_ENTRY * *));
-static int ctblcmp(P1(const unsigned char *)
-                                  Pi(const unsigned char *) Pi(int));
+static int rec_okay(int, int *, RECORD_ENTRY * *);
+static int ctblcmp(const unsigned char *, const unsigned char *, int);
 
 /* Check for valid db number and set curr_db, curr_db_table and curr_rn_table
 */

cde/lib/DtSearch/raima/mapchar.c

@@ -70,8 +70,8 @@ static int cptr = -1;
 static int buflen;
 
 /* ********************** LOCAL FUNCTION DECLARATIONS **************** */
-static void bgets(P1(char *) Pi(int) Pi(int));
-static int nextc(P1(int));
+static void bgets(char *, int, int);
+static int nextc(int);
 
 /* Map ASCII-Characters for output and sorting
 */

cde/lib/DtSearch/raima/pathfcns.c

@@ -81,11 +81,11 @@
 
 /* ********************** FUNCTION PROTOTYPES ************************ */
 
-static int isabs(P1(char *));
+static int isabs(char *);
 					/* TRUE if path is absolute */
-static char * remdrv(P1(char *));
+static char * remdrv(char *);
 					/* Removes drive spec from path */
-static char * remfile(P1(char *));
+static char * remfile(char *);
 					/* Removes file from path */
 
 /* ======================================================================

cde/lib/DtSvc/DtEncap/spc-util.c

@@ -200,6 +200,7 @@ int sprintf_len (XeString s, XeString format, ...)
   va_start(ap, format);
   if (s) *s = XeChar_NULL;
   vsprintf(s, format, ap);
+  va_end(ap);
   return(strlen(s));
 }
 

cde/lib/DtSvc/DtUtil1/ActionTt.c

@@ -852,10 +852,9 @@ static int _DtAct_tt_message_arg_reptype( Tt_message message, int arg )
 
     status = tt_message_arg_ival( message, arg, &testVal );
 
-    if (status == TT_OK)
-	return( DtACT_TT_REP_INT);
-    else if (status == TT_ERR_NUM)
-	return( DtACT_TT_REP_BUFFER );
+    if (status == TT_ERR_NUM)
+	return DtACT_TT_REP_BUFFER;
+    return DtACT_TT_REP_INT;
 }
 
 /******************************************************************************

cde/lib/DtSvc/DtUtil1/strtab.c

@@ -151,13 +151,18 @@ _DtShmProtoInitStrtab(int sizeguess)
   return((DtShmProtoStrtab) ptr);
 }
 
+static int destroy_hashval(int *ptr, int *unused, unsigned char *unused2) {
+	free(ptr);
+	return 0;
+}
+
 int 
 _DtShmProtoDestroyStrtab(DtShmProtoStrtab strlist)
 {
   strlist_t * ptr = (strlist_t *) strlist;
   
   _DtUtilDestroyHash(ptr->sl_hash, NULL, NULL);
-  _DtUtilDestroyHash(ptr->sl_bosons, (des_func)free, NULL);
+  _DtUtilDestroyHash(ptr->sl_bosons, destroy_hashval, NULL);
   free(ptr);
   return(0);
 }

cde/lib/DtTerm/TermPrim/TermPrimScroll.c

@@ -922,11 +922,9 @@ _DtTermPrimScrollCompleteIfNecessary(Widget w, short scrollTopRow,
 	if ((lines + tpd->scroll.jump.scrollLines > maxJumpScrollLines) ||
 		(lines + tpd->scroll.jump.scrollLines < -maxJumpScrollLines))
 	    (void) _DtTermPrimScrollComplete(w, True);
-	    return;
     } else {
 	if (!tw->term.jumpScroll && tpd->scroll.nojump.pendingScroll) {
 	    (void) _DtTermPrimScrollComplete(w, True);
-	    return;
 	}
     }
 }

cde/lib/DtTerm/TermView/TermViewMenu.c

@@ -667,7 +667,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 	(void) XtFree(accelerator);
 	(void) XtFree(acceleratorText);
     }
-    if (menuBar || (!menuBar && firstPopup))
+    if (menuBar || (!menuBar && firstPopup)) {
 #ifdef	PULLDOWN_ACCELERATORS
 	ks = XStringToKeysym(GETMESSAGE(NL_SETN_ViewMenu,21, "W"));
 	(void) _DtTermViewCreateCascadeButton(menu, pulldown[pc], 
@@ -679,6 +679,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 	        (GETMESSAGE(NL_SETN_ViewMenu,20, "Window")),
 		NoSymbol, NULL, NULL, NULL, NULL);
 #endif	/* PULLDOWN_ACCELERATORS */
+    }
 
     (void) pc++;
     if (first) {
@@ -710,7 +711,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 	(void) XtFree(accelerator);
 	(void) XtFree(acceleratorText);
     }
-    if (menuBar || (!menuBar && firstPopup))
+    if (menuBar || (!menuBar && firstPopup)) {
 #ifdef	PULLDOWN_ACCELERATORS
 	ks = XStringToKeysym(GETMESSAGE(NL_SETN_ViewMenu,31, "E"));
 	(void) _DtTermViewCreateCascadeButton(menu, pulldown[pc], 
@@ -722,6 +723,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 	        (GETMESSAGE(NL_SETN_ViewMenu,30, "Edit")),
 		NoSymbol, NULL, NULL, NULL, NULL);
 #endif	/* PULLDOWN_ACCELERATORS */
+    }
 
     (void) pc++;
     if (first) {
@@ -777,7 +779,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 		ks,
 		NULL, NULL, NULL, NULL);
     }
-    if (menuBar || (!menuBar && firstPopup))
+    if (menuBar || (!menuBar && firstPopup)) {
 #ifdef	PULLDOWN_ACCELERATORS
         ks = XStringToKeysym(GETMESSAGE(NL_SETN_ViewMenu,47, "O"));
 	(void) _DtTermViewCreateCascadeButton(menu, pulldown[pc], 
@@ -789,6 +791,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 	          (GETMESSAGE(NL_SETN_ViewMenu,46, "Options")),
 		NoSymbol, NULL, NULL, NULL, NULL);
 #endif	/* PULLDOWN_ACCELERATORS */
+    }
 
     (void) pc++;
     if (first) {
@@ -905,7 +908,7 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 		NULL, NULL, helpAboutDttermCallback, NULL);
     }
 
-    if (menuBar || (!menuBar && firstPopup))
+    if (menuBar || (!menuBar && firstPopup)) {
 #ifdef	PULLDOWN_ACCELERATORS
 	ks = XStringToKeysym(GETMESSAGE(NL_SETN_ViewMenu,81,"H"));
 	cascade = _DtTermViewCreateCascadeButton(menu, pulldown[pc], 
@@ -918,6 +921,8 @@ CreateMenu(Widget termView, Widget parent, Boolean menuBar,
 		NoSymbol, NULL, NULL, NULL, NULL);
 #endif	/* PULLDOWN_ACCELERATORS */
 #endif	/* HPVUE */
+    }
+
     if (menuBar) {
 	/* this is the help button... */
 	i = 0;

cde/lib/DtWidget/ComboBox.c

@@ -2481,7 +2481,7 @@ activate_cb(	Widget w,
     XmProcessTraversal((Widget)combo_w, 
 			(XmTraversalDirection) XmTRAVERSE_CURRENT);
 
-    if (Type(combo_w) == DtDROP_DOWN_COMBO_BOX)
+   if (Type(combo_w) == DtDROP_DOWN_COMBO_BOX)
 	TextFieldActivate(combo_p, call_data);
 
     /*

cde/lib/csa/connection.c

@@ -864,5 +864,6 @@ regstat4_to_dtcmstatus(Registration_Status_4 stat4)
 	case confused_4:
 		return (CSA_E_FAILURE);
 	}
+	return CSA_E_FAILURE;
 }
 

cde/lib/csa/match.c

@@ -1046,7 +1046,7 @@ match_this_attribute(Appt_4 *appt, cms_attribute attr, CSA_enum op)
 
 		return (_DtCm_match_sint32_attribute(&oldattr,
 			(attr.value ? &matchattr : NULL), op));
-	defalut:
+	default:
 		return (B_FALSE);
 	}
 }

cde/lib/tt/bin/scripts/Makefile.am

@@ -1,16 +1,4 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-TT_VERSION = "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
-TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
-
 noinst_SCRIPTS = ttce2xdr
-BUILT_SOURCES = ttce2xdr
 CLEANFILES = ttce2xdr
-
-AM_CPPFLAGS = $(TT_VERSION_DEFINE)
-
-
-ttce2xdr: ttce2xdr.cpp
-	$(RM) $@
-	$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
-

cde/lib/tt/bin/scripts/ttce2xdr.in

@@ -1,18 +1,18 @@
-XCOMM! /bin/sh
-XCOMM $XConsortium: ttce2xdr.cpp /main/4 1996/04/21 19:11:34 drk $
-XCOMM (c) Copyright 1996 Digital Equipment Corporation.
-XCOMM (c) Copyright 1993,1994,1996 Hewlett-Packard Company.
-XCOMM (c) Copyright 1993,1994,1996 International Business Machines Corp.
-XCOMM (c) Copyright 1992-1994,1996 Sun Microsystems, Inc.
-XCOMM (c) Copyright 1993,1994,1996 Novell, Inc.
-XCOMM (c) Copyright 1996 FUJITSU LIMITED.
-XCOMM (c) Copyright 1996 Hitachi.
-XCOMM
-XCOMM ttce2xdr - Convert ToolTalk Classing Engine tables to XDR types database
+#!/bin/sh
+# $XConsortium: ttce2xdr.cpp /main/4 1996/04/21 19:11:34 drk $
+# (c) Copyright 1996 Digital Equipment Corporation.
+# (c) Copyright 1993,1994,1996 Hewlett-Packard Company.
+# (c) Copyright 1993,1994,1996 International Business Machines Corp.
+# (c) Copyright 1992-1994,1996 Sun Microsystems, Inc.
+# (c) Copyright 1993,1994,1996 Novell, Inc.
+# (c) Copyright 1996 FUJITSU LIMITED.
+# (c) Copyright 1996 Hitachi.
+#
+# ttce2xdr - Convert ToolTalk Classing Engine tables to XDR types database
 
-XCOMM
-XCOMM usage
-XCOMM
+#
+# usage
+#
 usage() {
 	echo "$1: convert ToolTalk CE tables to XDR types database"
 	echo "Usage: $1 [-xn][-d user|system]"
@@ -29,32 +29,32 @@ usage() {
 	echo "  <OPENWINHOME2>	OWv3 installation to write to"
 }
 
-XCOMM
-XCOMM version
-XCOMM
+#
+# version
+#
 version() {
-	echo TT_VERSION_STRING
+	echo "CDE Version @CDE_VERSION_MAJOR@.@CDE_VERSION_MINOR@.@CDE_VERSION_MICRO@@CDE_VERSION_DEV@"
 }
 
-XCOMM
-XCOMM cleanup - Call me before exiting
-XCOMM
+#
+# cleanup - Call me before exiting
+#
 cleanup() {
 	rm -f /tmp/ttce2xdr.types.$$ /tmp/ttce2xdr.types.$$.deps /tmp/ttce2xdr.ceascii.$$
 }
 
-XCOMM
-XCOMM nullit - create null ~/.tt/xdr.types so auto convert won't be run
-XCOMM next time
-XCOMM
+#
+# nullit - create null ~/.tt/xdr.types so auto convert won't be run
+# next time
+#
 nullit() {
 	test -d $HOME/.tt || mkdir $HOME/.tt
 	touch $HOME/.tt/types.xdr
 }
 
-XCOMM
-XCOMM Main
-XCOMM
+#
+# Main
+#
 trap cleanup 0 1 2 3 15
 
 cmd=`basename $0`
@@ -64,9 +64,9 @@ database=
 ow1=
 ow2=
 
-XCOMM
-XCOMM Parse command line
-XCOMM
+#
+# Parse command line
+#
 args=$*
 while getopts hxnvrfd: option
 do
@@ -79,14 +79,14 @@ do
 	esac
 done
 
-XCOMM
-XCOMM Discard args processed by getopts
-XCOMM
+#
+# Discard args processed by getopts
+#
 shift `expr $OPTIND - 1`
 
-XCOMM
-XCOMM Process mandatory args
-XCOMM
+#
+# Process mandatory args
+#
 if [ $# -gt 0 ]; then
 	ow1=$1
 	shift
@@ -96,9 +96,9 @@ if [ $# -gt 0 ]; then
 	fi
 fi
 
-XCOMM
-XCOMM Check for extraneous args
-XCOMM
+#
+# Check for extraneous args
+#
 if [ $# -gt 0 ]; then
 	usage $cmd
 	exit 1
@@ -122,13 +122,13 @@ else
 	database="user"
 fi
 
-XCOMM if we are doing user (perhaps automatic) conversion. make
-XCOMM sure there is some conversion to do, otherwise we can bail out
-XCOMM early.
+# if we are doing user (perhaps automatic) conversion. make
+# sure there is some conversion to do, otherwise we can bail out
+# early.
 
 if [ "$database" = "user" ]; then
 	if [ ! -f $HOME/.cetables/cetables ]; then
-XCOMM		user doesn't even have a cetables, nothing to do
+#		user doesn't even have a cetables, nothing to do
 		nullit
 		exit 0
 	fi
@@ -138,22 +138,22 @@ XCOMM		user doesn't even have a cetables, nothing to do
 	if egrep -s "NS_NAME=SUN_TOOLTALK_TYPES" /tmp/ttce2xdr.ceascii.$$ ; then
 		:
 	else
-XCOMM		user has cetables, but no ToolTalk types
+#		user has cetables, but no ToolTalk types
 		nullit
 		exit 0
 	fi
 
-XCOMM	Now, we know the user has a cetables with ToolTalk types.  Now
-XCOMM	check for a possible malformed cetables with no ToolTalk name
-XCOMM	space definition.
+#	Now, we know the user has a cetables with ToolTalk types.  Now
+#	check for a possible malformed cetables with no ToolTalk name
+#	space definition.
 
 	if egrep -s '^NS_ATTR=$' /tmp/ttce2xdr.ceascii.$$ ; then
 
-XCOMM 		The cetables exists, and has ToolTalk types, but
-XCOMM		since the basic definitions in the network CE database
-XCOMM		may be gone, we need to add them back in.  Eventually
-XCOMM		in a future release we should remove all ToolTalk info
-XCOMM		from user's cetables.
+# 		The cetables exists, and has ToolTalk types, but
+#		since the basic definitions in the network CE database
+#		may be gone, we need to add them back in.  Eventually
+#		in a future release we should remove all ToolTalk info
+#		from user's cetables.
 
 		ed /tmp/ttce2xdr.ceascii.$$  >/dev/null <<- 'EOF'
 /^NS_ATTR=$/d
@@ -222,11 +222,11 @@ else
 	fi
 	rm -f /tmp/ttce2xdr.types.$$
 	if tt_type_comp -Eps $dbopt > /tmp/ttce2xdr.types.$$; then :; else
-XCOMM		Conversion failed for some reason. If we're working on a
-XCOMM		user database, we're probably doing an automatic conversion.
-XCOMM		and there's no point in continuing to retry this every time.
-XCOMM		Just touch the .tt/types.xdr file so auto conversion won't
-XCOMM		keep getting run.
+#		Conversion failed for some reason. If we're working on a
+#		user database, we're probably doing an automatic conversion.
+#		and there's no point in continuing to retry this every time.
+#		Just touch the .tt/types.xdr file so auto conversion won't
+#		keep getting run.
 	
 		case $database in
 			user)

cde/lib/tt/lib/util/tt_audit.C

@@ -292,8 +292,6 @@ entry(const char *argskey, _Tt_entry_pt func, ...)
 		break;
 	}
 
-	va_start(ap, func);
-
 	// paramater checking for NULL & cascaded errors, over-long
 	// propnames, etc.
 	preview = argskey;

cde/lib/tt/mini_isam/isaddindex.c

@@ -58,7 +58,6 @@
 int 
 isaddindex(int isfd, struct keydesc *keydesc)
 {
-    int			_amaddindex();
     Fab	*fab;
     int			ret;
 

cde/lib/tt/mini_isam/isaddprimary.c

@@ -40,7 +40,7 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-Static int _am_addprimary();
+Static int _am_addprimary(Fab *fab, struct keydesc *keydesc);
 
 
 /*

cde/lib/tt/mini_isam/isam.h

@@ -52,12 +52,15 @@ SMI */
 #define LONG_BIT 32
 #endif
 
-extern short ldint();
-extern long ldlong();
-extern float ldfloat();
-extern double lddbl();
+extern short ldint(char *);
+extern long ldlong(char *);
+extern float ldfloat(char *);
+extern double lddbl(char *);
 extern short ldshort();
-extern int ldchar(), stchar(), stlong(), stdbl();
+extern int ldchar(char *, int, char *);
+extern int stchar(char *, char *, int);
+extern int stlong(long, char *);
+extern int stdbl(double, char *);
 extern int stint(short val, char *p);
 extern int stfloat(float f, char *p);
 

cde/lib/tt/mini_isam/isam_impl.h

@@ -162,9 +162,9 @@ typedef struct bytearray {
     char	*data;
 } Bytearray;
 
-extern Bytearray _bytearr_getempty(), _bytearr_dup();
+extern Bytearray _bytearr_getempty(), _bytearr_dup(Bytearray *);
 extern Bytearray _bytearr_new(u_short len, char *data);
-extern void _bytearr_free();
+extern void _bytearr_free(Bytearray *);
 
 
 /* Client identification - used to identify owners of locks */
@@ -176,9 +176,8 @@ extern void _bytearr_free();
 #define MAXISFD		FD_SETSIZE
 #define NOISFD		(-1)		     /* Not a valid file descriptor */
 
-extern struct fab *_isfd_find();
-extern void _isfd_delete();
-extern Isfd _isfd_insert();
+extern struct fab *_isfd_find(Isfd);
+extern void _isfd_delete(Isfd);
 
 /* Definitions related to File access block (isfab.c file */
 
@@ -194,8 +193,8 @@ enum readmode { RM_FIRST = 0, RM_LAST = 1, RM_NEXT = 2, RM_PREV = 3,
 /* lock flag is passed to Access Method module for every record oriented op. */
 /* Bit position in the lock flag: */
 
-enum openmode _getopenmode();
-enum readmode _getreadmode();
+enum openmode _getopenmode(int);
+enum readmode _getreadmode(int);
 
 /* Error code structure */
 struct errcode {
@@ -228,8 +227,8 @@ typedef struct fab {
 
 #define FAB_ISFDSET(fab, isfd) (fab->isfd = isfd)
 
-extern Fab *_fab_new();
-void _fab_destroy();
+extern Fab *_fab_new(char *, enum openmode, Bool, int, int);
+void _fab_destroy(Fab *);
 
 /* ISAM file identification for locking purposes. */
 typedef struct lckfid {

cde/lib/tt/mini_isam/isam_prototypes.h

@@ -166,7 +166,7 @@ int iserase(char *isfname);
 void _isfatal_error(char *msg);
 void _isfatal_error1(char *msg);
 void _isam_warning(char *msg);
-int _isfatal_error_set_func(int (*func)(void));
+int _isfatal_error_set_func(int (*func)(char *));
 void _setiserrno2(int error, int is1, int is2);
 void _seterr_errcode(struct errcode *errcode);
 

cde/lib/tt/mini_isam/isamaddindex.c

@@ -42,11 +42,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-extern int _iskeycmp();
-
-static void _readallrecords(), _attach_dups_serial();
-static Blkno _buildbtree();
-static int _duplicate_exist();
+static void _readallrecords(Fcb *fcb, Issort *srt, Keydesc2 *pkeydesc2);
+static void _attach_dups_serial(Issort *srt, Keydesc2 *pkeydesc2);
+static Blkno _buildbtree(Fcb *fcb, Keydesc2 *pkeydesc2, Issort *srt);
+static int _duplicate_exist(Issort *srt, int keylength);
 static void checkavailfd(void);
 
 /*
@@ -386,7 +385,7 @@ _readallrecords(Fcb *fcb, Issort *srt, Keydesc2 *pkeydesc2)
 	char		keybuf [MAXKEYSIZE];
 	Recno		recnum;
 	int		reclen = 0;
-	int		(*rec_read)() = (fcb->varflag?_vlrec_read:_flrec_read);
+	int		(*rec_read)(Fcb *, char *, Recno, int *) = (fcb->varflag?_vlrec_read:_flrec_read);
 	
 	for (recnum = 1; recnum <= fcb->lastrecno; recnum++) {
 	
@@ -457,7 +456,6 @@ _attach_dups_serial(Issort *srt, Keydesc2 *pkeydesc2)
 Static Blkno 
 _buildbtree(Fcb *fcb, Keydesc2 *pkeydesc2, Issort *srt)
 {
-    Bufhdr		*_allockpage();
     int			depth;
     int 		nrecords = fcb->nrecords;
     int			keyspernode[ISMAXBTRLEVEL];

cde/lib/tt/mini_isam/isamdelrec.c

@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-void _delkeys();
+void _delkeys(Fcb *fcb, char *record, Recno recnum);
 
 /*
  * _amdelrec(isfhandle, recnum, errcode)
@@ -62,8 +62,8 @@ _amdelrec(Bytearray *isfhandle, Recno recnum, struct errcode *errcode)
     Fcb			*fcb = NULL;
     char		recbuf[ISMAXRECLEN];
     int			reclen;
-    int			(*rec_read)();
-    int			(*rec_delete)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_delete)(Fcb *, Recno);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isamwrite.c

@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-static int _addkeys2 ();
+static int _addkeys2 (Fcb *fcb, char *record, Recno recnum, Bytearray *curpos);
 extern long *ismaxlong;
 
 /*
@@ -70,7 +70,7 @@ _amwrite(Bytearray *isfhandle, char *record, int reclen,
     Recno		recnum2;
     Crp 		*crp;
     int			err;
-    int			(*rec_write)();
+    int			(*rec_write)(Fcb *, char *, Recno *, int);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isbtree2.c

@@ -40,8 +40,6 @@
 
 #include "isam_impl.h"
 
-extern int _iskeycmp();
-
 void leftkey_up(Btree *, int);
 
 static void insert_key(Btree *, char *, int, char *, Blkno);

cde/lib/tt/mini_isam/isbtree3.c

@@ -40,8 +40,6 @@
 
 #include "isam_impl.h"
 
-extern int _iskeycmp();
-
 static void remove_entry(Btree *, char *, int);
 static void move_from_right(Btree *, char *, char *, int);
 static void move_from_left(Btree *, char *, char *, int);

cde/lib/tt/mini_isam/iscntl.c

@@ -70,7 +70,7 @@
  *
  */
 
-typedef int (* intfunc)();
+typedef int (* intfunc)(char *);
 
 int 
 iscntl(int isfd, int func, ...)

cde/lib/tt/mini_isam/isdelcurr.c

@@ -40,7 +40,7 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amdelcurr();
+static int _amdelcurr(Bytearray *isfhandle, Bytearray *curpos, Recno *recnum, struct errcode *errcod);
 
 /*
  * err = isdelcurr(isfd, record)
@@ -67,7 +67,7 @@ isdelcurr(int isfd)
     int			_am_delcurr();
     Fab	*fab;
     int			ret;
-    int			recnum;
+    Recno		recnum;
 
     /*
      * Get File Access Block.
@@ -118,8 +118,8 @@ _amdelcurr(Bytearray *isfhandle, Bytearray *curpos, Recno *recnum,
     Crp			*crp;
     char		recbuf[ISMAXRECLEN];
     int			reclen;
-    int			(*rec_read)();
-    int			(*rec_delete)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_delete)(Fcb *, Recno);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isdelrec.c

@@ -62,7 +62,6 @@
 int 
 isdelrec(int isfd, long recnum)
 {
-    int			_amdelrec();
     Fab	*fab;
     int			ret;
 

cde/lib/tt/mini_isam/isdiskbufs2.c

@@ -62,9 +62,13 @@ extern struct dlink *_isdln_next(), *_isdln_first();
 #define _isdln_isempty(l)  _isdln_base_isempty(base,(l))
 
 /*---------------------- Local data ---------------------------------------*/
-static Bufhdr *_getavail(), *_findblock();
-static void _disk_init(), _commit1buffer(), _rollback1buffer(), _flush1buffer();
-static void _makenodata();
+static Bufhdr *_getavail(void);
+static Bufhdr *_findblock(Fcb *fcb, int unixfd, Blkno blkno);
+static void _disk_init(void);
+static void _commit1buffer(Bufhdr *p);
+static void _rollback1buffer(Bufhdr *p);
+static void _flush1buffer(Bufhdr *p);
+static void _makenodata(Bufhdr *p);
 
 Bufhdr bufhdrs [ISMAXBUFFERS];
 struct dlink  hashhdrs [ISHASHHDRS];	     /* Heads of hashed lists */

cde/lib/tt/mini_isam/iserase.c

@@ -41,8 +41,10 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-static void _unlink_datfile(), _unlink_indfile(), _unlink_varfile();
-static int _amerase();
+static void _unlink_datfile(char *isfname);
+static void _unlink_indfile(char *isfname);
+static void _unlink_varfile(char *isfnam);
+static int _amerase(Bytearray *isfhandle, struct errcode *errcode);
 
 /*
  * isfd = iserase(isfname, mode)

cde/lib/tt/mini_isam/iserror.c

@@ -48,7 +48,7 @@
  * Fatal error. Display message and terminate program.
  */
 
-static int (*fatal_error_user_handler)();    /* set by iscntl(..,ISCNTL_FATAL,..) */
+static int (*fatal_error_user_handler)(char *);    /* set by iscntl(..,ISCNTL_FATAL,..) */
 
 void 
 _isfatal_error(char *msg)
@@ -109,10 +109,10 @@ _isam_warning(char *msg)
 }
 
 /* Set user specified fatal_error handler */
-int  _isfatal_error_set_func(int(*func)())
+int  _isfatal_error_set_func(int(*func)(char *))
 {
 #if 0
-    int		(*oldfunc)();
+    int		(*oldfunc)(char *);
 
     oldfunc = fatal_error_user_handler;
 #endif

cde/lib/tt/mini_isam/isfcb.c

@@ -42,9 +42,15 @@
 #include "isam_impl.h"
 #include <sys/stat.h>
 
-static int _create_datfile(), _create_indfile(), _create_varfile();
-static void _remove_datfile(), _remove_indfile(), _remove_varfile();
-Static int _open_datfile(), _open_indfile(), _open_varfile();
+static int _create_datfile(char *isfname);
+static int _create_indfile(char *isfname);
+static int _create_varfile(char *isfname);
+static void _remove_datfile(char *isfname);
+static void _remove_indfile(char *isfname);
+static void _remove_varfile(char *isfname);
+static int _open_datfile(char *isfname, Bool *rdonly);
+static int _open_indfile(char *isfname, Bool rdonly);
+static int _open_varfile(char *isfname, Bool rdonly);
 
 /*
  * _isfcb_create(isfname, crdat, crind, crvar, owner, group, u_mask, errcode)

cde/lib/tt/mini_isam/isfcbindex.c

@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-Static int _keypart2cmp();
+Static int _keypart2cmp(struct keypart2 *l, struct keypart2 *r);
 /*
  * _isfcb_primkeyadd(fcb, keydesc2)
  *

cde/lib/tt/mini_isam/isfileio.c

@@ -38,8 +38,8 @@
 
 #include "isam_impl.h"
 
-static int _getoffset();
-static Blkno _getblkno();
+static int _getoffset(long pos);
+static Blkno _getblkno(long pos);
 
 
 /*

cde/lib/tt/mini_isam/isfixrec.c

@@ -39,9 +39,9 @@
 #include "isam_impl.h"
 
 /* Local functions */
-long _fl_getpos();			     /* Get offset in .rec file */
+long _fl_getpos(Fcb *fcb, Recno recnum);			     /* Get offset in .rec file */
 int  _fl_deleted();			     /* 0/1 returns 1 if record is deleted */
-static void remove_from_chain();	     /* used by _flrec_wrrec() */
+static void remove_from_chain(Fcb *fcb, Recno recnum);	     /* used by _flrec_wrrec() */
 
 /*
  * _flrec_write(fcb, record, recnum, reclen)

cde/lib/tt/mini_isam/isfname.c

@@ -40,9 +40,6 @@
 
 #include "isam_impl.h"
 
-void _removelast();
-char *_lastelement();
-
 /*
  * _makedat_isfname(isfname)
  *

cde/lib/tt/mini_isam/isindfreel.c

@@ -39,8 +39,6 @@
 
 #include "isam_impl.h"
 
-extern Bufhdr *_isdisk_fix();
-
 /*
  * blkno = _isfreel_alloc()
  *

cde/lib/tt/mini_isam/iskeyvalid.c

@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-static int _check_typelen();
+static int _check_typelen(int type, int length);
 
 /*
  * _validate_keydesc(keydesc, minreclen)

cde/lib/tt/mini_isam/ismngfcb.c

@@ -60,7 +60,7 @@ struct hashtable {
 } hashtable [FCBHASHSIZE];
 #define unused(entry) ((entry).fcb == NULL)
 
-static int _hashisfhandle();
+static int _hashisfhandle(Bytearray *isfhandle);
 
 static int mrused_last = 0;			     /* stamp generator */
 

cde/lib/tt/mini_isam/isopen.c

@@ -41,7 +41,7 @@
 #include <sys/file.h>
 #include <sys/time.h>
 
-static int _am_open();
+static int _am_open(Fab *fab);
 /*
  * isfd = isopen(isfname, mode)
  *

cde/lib/tt/mini_isam/isread.c

@@ -40,7 +40,9 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amread();
+static int _amread(Bytearray *isfhandle, char *record, int *reclen,
+        enum readmode readmode, Bytearray *curpos, Recno *recnum,
+        struct errcode *errcode);
 
 /*
  * err =  isread(isfd, record, mode)
@@ -159,7 +161,7 @@ _amread(Bytearray *isfhandle, char *record, int *reclen,
     int			skipbytes;
     int			ret;
     Bytearray		oldcurpos;
-    int			(*rec_read)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isrename.c

@@ -41,11 +41,11 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-void _removelast();
-static void _removelast2();
-char *_lastelement();
-static void _rename_datfile(), _rename_indfile(), _rename_varfile();
-static int _amrename();
+static void _removelast2(char *);
+static void _rename_datfile(char *isfname, char *newnam);
+static void _rename_indfile(char *isfname, char *newnam);
+static void _rename_varfile(char *isfname, char *newnam);
+static int _amrename(Bytearray *isfhandle, char *newname, struct errcode *errcode);
 
 /*
  * isfd = isrename(oldname, newname)

cde/lib/tt/mini_isam/isrepair.c

@@ -63,16 +63,16 @@
  *   verbose option (if set to nonzero) will print messages to stdout.
  */
 
-Static	char *rp_readrecord_v(), *rp_readrecord_f();
+Static char *rp_readrecord_v(int datfd, int varfd, long offset, int minreclen, int maxreclen);
+Static char *rp_readrecord_f(int datfd, long offset, int reclen);
 Static int printkey(int, struct keydesc *, int (*)(const char *, ...));
 Static void cmd_error(const char *, int (*)(const char *, ...));
-Static int typeletter();
-Static int rp_readcntlpg();
+Static int typeletter(int type);
+Static int rp_readcntlpg(int datfd, char *cntlpg);
 static int  isnoprintf(const char *, ...);
 
 int isrepair(char *isfname, int verbose)
 {
-  extern      char *rp_readrecord_v(), *rp_readrecord_f();
   char	      cntlpg[ISCNTLSIZE];
   int	      datfd = -1, indfd = -1, varfd = -1;
   int	      minreclen, maxreclen;

cde/lib/tt/mini_isam/isrewcurr.c

@@ -40,7 +40,10 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amrewcurr(), _changekeys2();
+static int _amrewcurr(Bytearray *isfhandle, char *record, int reclen,
+           Bytearray *curpos, Recno *recnum, struct errcode *errcode);
+static int _changekeys2(Fcb *fcb, char *record, char *oldrecord,
+             Recno recnum, Bytearray *curpos);
 
 /*
  * err = isrewcurr(isfd, record)
@@ -73,7 +76,7 @@ isrewcurr(int isfd, char *record)
     Fab	*fab;
     int			reclen;
     int			ret;
-    int			recnum;
+    Recno		recnum;
 
     /*
      * Get File Access Block.
@@ -138,8 +141,8 @@ _amrewcurr(Bytearray *isfhandle, char *record, int reclen,
     int			err;
     char		oldrecord[ISMAXRECLEN];
     int			reclen2;
-    int			(*rec_read)();
-    int			(*rec_rewrite)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_rewrite)(Fcb *, char *, Recno, int);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isrewrec.c

@@ -40,7 +40,8 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amrewrec(), _changekeys();
+static int _amrewrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum, struct errcode *errcode);
+static int _changekeys(Fcb *fcb, char *record, char *oldrecord, Recno recnum);
 
 /*
  * err = isrewrec(isfd, recnum, record)
@@ -132,8 +133,8 @@ _amrewrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum,
     char		oldrecbuf[ISMAXRECLEN];
     int			err;
     int			reclen2;
-    int			(*rec_read)();
-    int			(*rec_rewrite)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_rewrite)(Fcb *, char *, Recno, int);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isstart.c

@@ -41,7 +41,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 
-static int _amstart();
+static int _amstart(Bytearray *isfhandle, char *record, int *reclen,
+         enum readmode readmode, struct keydesc *keydesc, int keylen,
+         Bytearray *curpos, Recno *recnum, struct errcode *errcod);
 
 /*
  * err =  isstart(isfd, keydesc, length, record, mode)
@@ -171,7 +173,7 @@ _amstart(Bytearray *isfhandle, char *record, int *reclen,
     char		*pkey;
     Btree		*btree = NULL;
     int			reclen2;
-    int			(*rec_read)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
 
     _isam_entryhook();
 

cde/lib/tt/mini_isam/isvarrec.c

@@ -39,12 +39,12 @@
 #include "isam_impl.h"
 
 /* Local functions */
-long _vl_getpos();			     /* Get offset in .rec file */
+long _vl_getpos(Fcb *fcb, Recno recnum);			     /* Get offset in .rec file */
 int  _vl_deleted();			     /* 0/1 returns 1 if record is deleted */
-static void remove_from_chain2();	     /* used by _vlrec_wrrec() */
-long _istail_insert();
-static void _istail_delete();
-static int _istail_read();
+static void remove_from_chain2(Fcb *fcb, Recno recnum);	     /* used by _vlrec_wrrec() */
+long _istail_insert(Fcb *fcb, char *tailp, int taillen);
+static void _istail_delete(Fcb *fcb, long offset);
+static int _istail_read(Fcb *fcb, long offset, char *buffer);
 
 /*
  * _vlrec_write(fcb, record, recnum, reclen)

cde/lib/tt/mini_isam/iswrite.c

@@ -41,7 +41,8 @@
 #include <sys/file.h>
 #include <sys/time.h>
 
-static int _am_write();
+static int _am_write(Fab *fab, char *record, int reclen,
+                     Bytearray *curpos, Recno *recnum);
 
 /*
  * err =  iswrite(isfd, record)
@@ -70,7 +71,6 @@ static int _am_write();
 int 
 iswrite(int isfd, char *record)
 {
-    int			_am_write();
     Fab	*fab;
     int			reclen;
     Recno		recnum;

cde/lib/tt/mini_isam/iswrrec.c

@@ -39,7 +39,8 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amwrrec();
+static int _amwrrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum,
+         struct errcode *errcode);
 
 /*
  * isfd = iswrrec(isfd, recnum, record)
@@ -130,7 +131,7 @@ _amwrrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum,
 {
     Fcb			*fcb = NULL;
     int			err;
-    int			(*rec_wrrec)();
+    int			(*rec_wrrec)(Fcb *, char *, Recno, int);
 
     _isam_entryhook();
 

cde/programs/dtaction/Main.c

@@ -578,7 +578,6 @@ AddSuLog(
 
 {
     char        *toString;
-    struct tm  *localtime ();
 
        FILE * f;
     struct stat st;

cde/programs/dtcm/dtcm/calendarA.c

@@ -151,9 +151,6 @@ extern int errno;
 #define NL_CAT_LOCALE       0
 #endif
 
-extern time_t timelocal();	/* LINT */
-extern char * getlogin();	/* LINT */
-extern void(*sigset())();
 extern int cmtt_init(char *, Calendar *, XtAppContext, Widget);
 extern void show_about(Widget, XtPointer, XtPointer);
 

cde/programs/dtcm/dtcm/dnd.c

@@ -364,7 +364,7 @@ schedule_appt(Calendar *c, Dtcm_appointment *a) {
 		set_message(c->message_text, "");
 		if ( rc == 2)
 			return 0;
-			return -1;
+		return -1;
 	}
 	} else {
 	if (!t->frame)

cde/programs/dtcm/dtcm/tempbr.c

@@ -89,11 +89,7 @@ static  char sccsid[] = "@(#)tempbr.c 1.48 95/03/28 Copyr 1991 Sun Microsystems,
 static void tb_cancel_cb();
 static void tb_close_cb();
 static void tempbr_show_cb(Widget w, XtPointer data, XtPointer cbs);
-#if defined(__linux__)
 #include <string.h>
-#else
-extern char *strdup(const char *);
-#endif
 
 #ifdef FNS_DEMO
 /* This stuff is currently broken */

cde/programs/dtcm/libDtCmP/getdate.y

@@ -157,7 +157,6 @@ static int mdays[12] =
 	{31, 0, 31,  30, 31, 30,  31, 31, 30,  31, 30, 31};
 #define epoch BOT_YEAR
 
-extern struct tm *localtime();
 time_t dateconv(int mm, 
     int dd, 
     int yy, 

cde/programs/dtcm/server/cmscalendar.c

@@ -601,16 +601,10 @@ _DtCmsSetCalendarAttrs4Parser(
 extern CSA_return_code
 _DtCmsRbToCsaStat(Rb_Status rb_stat)
 {
-	switch (rb_stat) {
-	case rb_ok:
-		return (CSA_SUCCESS);
-	case rb_duplicate:
-	case rb_badtable:
-	case rb_notable:
-	case rb_failed:
-	case rb_other:
-		return (CSA_E_FAILURE);
+	if (rb_stat == rb_ok) {
+		return CSA_SUCCESS;
 	}
+	return CSA_E_FAILURE;
 }
 
 extern void

cde/programs/dtcm/server/rtable2.c

@@ -63,7 +63,8 @@ _DtCm_rtable_lookup_2_svc (Table_Args_2 *args, struct svc_req *svcrq)
 	Table_Args_4 *newargs;
 	Table_Res_4 *newres;
 
-	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
 
 	newargs = _DtCm_tableargs2_to_tableargs4(args);
 	if(newargs) {
@@ -85,7 +86,8 @@ _DtCm_rtable_lookup_next_larger_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;   
         Table_Res_4 *newres; 
  
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
  
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -107,7 +109,8 @@ _DtCm_rtable_lookup_next_smaller_2_svc(Table_Args_2 *args, struct svc_req *svcrq
         Table_Args_4 *newargs;    
         Table_Res_4 *newres; 
   
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
   
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -130,7 +133,8 @@ _DtCm_rtable_lookup_range_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;     
         Table_Res_4 *newres; 
    
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
    
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -152,7 +156,8 @@ _DtCm_rtable_abbreviated_lookup_range_2_svc(Table_Args_2 *args, struct svc_req *
         Table_Args_4 *newargs;      
         Table_Res_4 *newres; 
     
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
    
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -174,7 +179,8 @@ _DtCm_rtable_insert_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;
         Table_Res_4 *newres;
     
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
   
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -196,7 +202,8 @@ _DtCm_rtable_delete_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;
         Table_Res_4 *newres; 
      
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
    
         newargs = _DtCm_tabledelargs2_to_tabledelargs4(args, do_all_4);
         if(newargs) {
@@ -216,7 +223,8 @@ _DtCm_rtable_delete_instance_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;  
         Table_Res_4 *newres;  
        
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
 
 	newargs = _DtCm_tabledelargs2_to_tabledelargs4(args, do_one_4);
         if(newargs) {
@@ -237,7 +245,8 @@ _DtCm_rtable_change_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs; 
         Table_Res_4 *newres;  
       
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
     
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -259,7 +268,8 @@ _DtCm_rtable_change_instance_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;   
         Table_Res_4 *newres;  
        
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
      
         newargs = _DtCm_tableargs2_to_tableargs4(args);  
         if(newargs) {
@@ -281,7 +291,8 @@ _DtCm_rtable_lookup_next_reminder_2_svc(Table_Args_2 *args, struct svc_req *svcr
         Table_Args_4 *newargs;    
         Table_Res_4 *newres;   
         
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_2, (char*)res);
+	res = NULL;
       
         newargs = _DtCm_tableargs2_to_tableargs4(args);
         if(newargs) {
@@ -427,7 +438,8 @@ _DtCm_rtable_get_access_2_svc(Access_Args_2 *args, struct svc_req *svcrq)
         Access_Args_4 *newargs;
         Access_Args_4 *newres;
         
-	if (res!=NULL) xdr_free((xdrproc_t)_DtCm_xdr_Access_Args_2, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free((xdrproc_t)_DtCm_xdr_Access_Args_2, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_accargs2_to_accargs4(args);
         if(newargs) {

cde/programs/dtcm/server/rtable3.c

@@ -63,7 +63,8 @@ _DtCm_rtable_lookup_3_svc (Table_Args_3 *args, struct svc_req *svcrq)
 	Table_Args_4 *newargs;
 	Table_Res_4 *newres;
 
-	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
 	newargs = _DtCm_tableargs3_to_tableargs4(args);
 	if(newargs) {
@@ -84,7 +85,8 @@ _DtCm_rtable_lookup_next_larger_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
 	Table_Args_4 *newargs;   
 	Table_Res_4 *newres; 
  
-	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
  
 	newargs = _DtCm_tableargs3_to_tableargs4(args);
 	if(newargs) {
@@ -105,7 +107,8 @@ _DtCm_rtable_lookup_next_smaller_3_svc(Table_Args_3 *args, struct svc_req *svcrq
 	Table_Args_4 *newargs;    
 	Table_Res_4 *newres; 
   
-	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
 	newargs = _DtCm_tableargs3_to_tableargs4(args);
 	if(newargs) {
@@ -126,7 +129,8 @@ _DtCm_rtable_lookup_range_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;     
         Table_Res_4 *newres; 
    
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_tableargs3_to_tableargs4(args); 
         if(newargs) {
@@ -147,7 +151,8 @@ _DtCm_rtable_abbreviated_lookup_range_3_svc(Table_Args_3 *args, struct svc_req *
         Table_Args_4 *newargs;      
         Table_Res_4 *newres; 
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_tableargs3_to_tableargs4(args);  
         if(newargs) {
@@ -168,7 +173,8 @@ _DtCm_rtable_insert_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;
         Table_Res_4 *newres;
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_tableargs3_to_tableargs4(args);
         if(newargs) {
@@ -189,7 +195,8 @@ _DtCm_rtable_delete_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;
         Table_Res_4 *newres; 
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
 	newargs = _DtCm_tabledelargs3_to_tabledelargs4(args, do_all_4);
         if(newargs) {
@@ -210,7 +217,8 @@ _DtCm_rtable_delete_instance_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;  
         Table_Res_4 *newres;  
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
 	newargs = _DtCm_tabledelargs3_to_tabledelargs4(args, do_one_4);
         if(newargs) {
@@ -231,7 +239,8 @@ _DtCm_rtable_change_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs; 
         Table_Res_4 *newres;  
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL; 
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL; 
 
         newargs = _DtCm_tableargs3_to_tableargs4(args);
         if(newargs) {
@@ -253,7 +262,8 @@ _DtCm_rtable_change_instance_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
         Table_Args_4 *newargs;   
         Table_Res_4 *newres;  
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_tableargs3_to_tableargs4(args);
         if(newargs) {
@@ -275,7 +285,8 @@ _DtCm_rtable_lookup_next_reminder_3_svc(Table_Args_3 *args, struct svc_req *svcr
         Table_Args_4 *newargs;    
         Table_Res_4 *newres;   
 
-        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+        if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_tableargs3_to_tableargs4(args);
         if(newargs) {
@@ -415,7 +426,8 @@ _DtCm_rtable_get_access_3_svc(Access_Args_3 *args, struct svc_req *svcrq)
         Access_Args_4 *newargs;
         Access_Args_4 *newres;
 
-	if (res!=NULL) xdr_free((xdrproc_t)_DtCm_xdr_Access_Args_3, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free((xdrproc_t)_DtCm_xdr_Access_Args_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_accargs3_to_accargs4(args);
         if(newargs) {
@@ -435,7 +447,8 @@ _DtCm_rtable_abbreviated_lookup_key_range_3_svc(Table_Args_3 *args, struct svc_r
         Table_Args_4 *newargs;   
         Table_Res_4 *newres;  
 
-	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res); res = NULL;
+	if (res!=NULL) xdr_free ((xdrproc_t)_DtCm_xdr_Table_Res_3, (char*)res);
+	res = NULL;
 
         newargs = _DtCm_tableargs3_to_tableargs4(args);
         if(newargs) {

cde/programs/dtcreate/FileCharacteristics.c

@@ -173,6 +173,7 @@ ushort GetContentsType(void)
     return((ushort)CA_FT_CNTLONG);
   }
   /* NOTREACHED */
+  return -1;
 }
 
 /******************************************************************************/

cde/programs/dtcreate/main.c

@@ -1273,8 +1273,10 @@ void UxDoEditPixmap(Widget wid, char *fname)
                  return;
               }
            }
-           if (fd1 > -1) close(fd1); fd1 = -1;
-           if (fd2 > -1) close(fd2); fd2 = -1;
+           if (fd1 > -1) close(fd1);
+	   fd1 = -1;
+           if (fd2 > -1) close(fd2);
+	   fd2 = -1;
 
 #ifdef DEBUG
            printf("final buffer = '%s'\n", buffer); /* debug */

cde/programs/dtdocbook/instant/tables.c

@@ -1303,6 +1303,7 @@ TblGetAlign(short col,			/* column number */
 	case Char:	return 'd';
 	case Span:	return 's';
 	}
+	return 'l';
 }
 
 /*	TblGetWidth()  --  get width spec, if any, for a entry

cde/programs/dtdocbook/instant/util.c

@@ -736,7 +736,8 @@ int Putc(
 	    case '\\':
 		*pc++ = '\\';
 	}
-	for (j = 0; j < i; ++j) *pc++ = argBuf[j]; i = 0;
+	for (j = 0; j < i; ++j) *pc++ = argBuf[j];
+	i = 0;
 	*pc++ = '"';
 	*pc++ = 0;
 	tcl_enc = Tcl_GetEncoding(NULL, NULL);

cde/programs/dtexec/Main.c

@@ -104,18 +104,6 @@
  */
 #define SHORT_SELECT_TIMEOUT	20
 
-/*
- * External system calls:
- */
-extern pid_t 	fork ();
-extern int 	execvp ();
-extern pid_t 	wait ();
-extern int 	atoi ();
-extern void 	_exit ();
-extern unsigned int 	sleep ();
-extern void 	exit ();
-extern char     *getenv();
-
 /*
  * Local func protos
  */

cde/programs/dtfile/Desktop.c

@@ -4111,17 +4111,18 @@ WorkSpaceRemoved (
 	       for(k=0;
 		 k<desktop_data->workspaceData[new_index]->files_selected;k++)
                {
-                /* Adjust the selectedDTWindows of current to accommadate the old list */
+                /* Adjust the selectedDTWindows of current to accommodate the old list */
 		  if(desktop_data->workspaceData[new_index]->
 		       selectedDTWindows[k] == desktop_data->desktopWindows[i])
 		  {
 		    desktop_data->workspaceData[new_index]->
 					selectedDTWindows[k] = NULL;
-		    for(;k<desktop_data->workspaceData[new_index]->files_selected;k++)
+		    for(;k<desktop_data->workspaceData[new_index]->files_selected;k++) {
 		      desktop_data->workspaceData[new_index]->
 	 	       selectedDTWindows[k] = desktop_data->
 			  workspaceData[new_index]-> selectedDTWindows[k+1];
 		      desktop_data->workspaceData[new_index]->files_selected--;
+		    }
 		    break;
 		  }
                }

cde/programs/dtfile/File.c

@@ -5706,23 +5706,30 @@ UpdateOneFileIcon(
 
    /* Build the rest of the arg list and either create or reuse the widget. */
 
-   XtSetArg (args[n], XmNstring, icon_label);                        n++;
+   XtSetArg (args[n], XmNstring, icon_label);
+   n++;
    argi_imageName = n;
    if (pixmapData)
      XtSetArg (args[n], XmNimageName, pixmapData->iconFileName);
    else
      XtSetArg (args[n], XmNimageName, NULL);
    n++;
-   XtSetArg (args[n], XmNmaxPixmapWidth, layout_data->pixmap_width);   n++;
-   XtSetArg (args[n], XmNmaxPixmapHeight, layout_data->pixmap_height); n++;
-   XtSetArg (args[n], XmNuserData, directory_set);                     n++;
-   XtSetArg (args[n], XmNunderline, False);                            n++;
-   XtSetArg (args[n], XmNfillMode, XmFILL_TRANSPARENT);                n++;
+   XtSetArg (args[n], XmNmaxPixmapWidth, layout_data->pixmap_width);
+   n++;
+   XtSetArg (args[n], XmNmaxPixmapHeight, layout_data->pixmap_height);
+   n++;
+   XtSetArg (args[n], XmNuserData, directory_set);
+   n++;
+   XtSetArg (args[n], XmNunderline, False);
+   n++;
+   XtSetArg (args[n], XmNfillMode, XmFILL_TRANSPARENT);
+   n++;
    if (file_mgr_data->view == BY_NAME_AND_ICON &&
        file_mgr_data->show_type != MULTIPLE_DIRECTORY)
       XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_TOP);
    else
-      XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_LEFT);            n++;
+      XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_LEFT);
+   n++;
 
    /* See if we can re-use the same or some other icon gadget */
    if (file_view_data->widget)
@@ -5738,7 +5745,8 @@ UpdateOneFileIcon(
       /* reuse the icon gadget */
       if (icon_widget != file_view_data->widget || file_mgr_data->newSize)
       {
-         XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);n++;
+         XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);
+	 n++;
          XtRemoveAllCallbacks(icon_widget, XmNdropCallback);
          file_view_data->registered = False;
       }
@@ -5766,25 +5774,34 @@ UpdateOneFileIcon(
    else
    {
       /* create a new or duplicate an existing widget */
-      XtSetArg (args[n], XmNshadowThickness, 2);             n++;
-      XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);n++;
-      XtSetArg (args[n], XmNfontList, user_font);            n++;
+      XtSetArg (args[n], XmNshadowThickness, 2);
+      n++;
+      XtSetArg (args[n], XmNdropSiteOperations, XmDROP_NOOP);
+      n++;
+      XtSetArg (args[n], XmNfontList, user_font);
+      n++;
       if( keybdFocusPolicy == XmEXPLICIT)
       {
-         XtSetArg (args[n], XmNtraversalOn, True);           n++;
+         XtSetArg (args[n], XmNtraversalOn, True);
+	 n++;
       }
       else
       {
-         XtSetArg (args[n], XmNtraversalOn, False);          n++;
-         XtSetArg (args[n], XmNhighlightThickness, 0);       n++;
+         XtSetArg (args[n], XmNtraversalOn, False);
+	 n++;
+         XtSetArg (args[n], XmNhighlightThickness, 0);
+	 n++;
       }
-      XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE);   n++;
+      XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE);
+      n++;
 
       if (layout_data->dup_icon_widget == NULL)
       {
 #ifdef HARDCODED_ICON_MARGINS
-         XtSetArg (args[n], XmNmarginWidth, 0);  n++;
-         XtSetArg (args[n], XmNmarginHeight, 0); n++;
+         XtSetArg (args[n], XmNmarginWidth, 0);
+	 n++;
+         XtSetArg (args[n], XmNmarginHeight, 0);
+	 n++;
 #endif
          XtSetArg (args[n], XmNx, -999);  n++;
          XtSetArg (args[n], XmNy, -999);  n++;
@@ -5815,9 +5832,12 @@ UpdateOneFileIcon(
          icon_widget->core.y = -999;
 
          /* make sure colors, drop operations, and clipping are right */
-         XtSetArg(args[i], XmNdropSiteOperations, XmDROP_NOOP);             i++;
-         XtSetArg(args[i], XmNmaxPixmapWidth, layout_data->pixmap_width);   i++;
-         XtSetArg(args[i], XmNmaxPixmapHeight, layout_data->pixmap_height); i++;
+         XtSetArg(args[i], XmNdropSiteOperations, XmDROP_NOOP);
+	 i++;
+         XtSetArg(args[i], XmNmaxPixmapWidth, layout_data->pixmap_width);
+	 i++;
+         XtSetArg(args[i], XmNmaxPixmapHeight, layout_data->pixmap_height);
+	 i++;
          XtSetValues (icon_widget, args, i);
       }
       XtAddCallback(icon_widget, XmNhelpCallback,

cde/programs/dtfile/FileDialog.c

@@ -1887,7 +1887,8 @@ FileTypePreview(
       if (pixmapData)
         XtSetArg (args[n], XmNimageName, pixmapData->iconFileName);
       else
-        XtSetArg (args[n], XmNimageName, NULL);                 n++;
+        XtSetArg (args[n], XmNimageName, NULL);
+      n++;
       XtSetValues (call_struct->file_type_widget, args, n);
 
       _DtCheckAndFreePixmapData(file_type,

cde/programs/dtfile/Filter.c

@@ -914,67 +914,96 @@ SetValues(
                                          LARGE);
 
       n = 0;
-      XtSetArg (args[n], XmNstring, icon_label);                        n++;
+      XtSetArg (args[n], XmNstring, icon_label);
+      n++;
       if (pixmapData)
         XtSetArg (args[n], XmNimageName, pixmapData->iconFileName);
       else
-        XtSetArg (args[n], XmNimageName, NULL);                         n++;
-      XtSetArg (args[n], XmNunderline, False);                          n++;
+        XtSetArg (args[n], XmNimageName, NULL);
+      n++;
+      XtSetArg (args[n], XmNunderline, False);
+      n++;
 
-      XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_TOP);              n++;
-      XtSetArg (args[n], XmNbehavior, XmICON_BUTTON);                   n++;
-      XtSetArg (args[n], XmNfillMode, XmFILL_PARENT);              n++;
+      XtSetArg (args[n], XmNpixmapPosition, XmPIXMAP_TOP);
+      n++;
+      XtSetArg (args[n], XmNbehavior, XmICON_BUTTON);
+      n++;
+      XtSetArg (args[n], XmNfillMode, XmFILL_PARENT);
+      n++;
 
-      XtSetArg (args[n], XmNforeground, foreground_color);           n++;
-      XtSetArg (args[n], XmNarmColor, white_pixel);                  n++;
+      XtSetArg (args[n], XmNforeground, foreground_color);
+      n++;
+      XtSetArg (args[n], XmNarmColor, white_pixel);
+      n++;
       if (background_color == white_pixel)
       {
-         XtSetArg (args[n], XmNbackground, white_pixel);             n++;
-         XtSetArg (args[n], XmNpixmapBackground, white_pixel);       n++;
-         XtSetArg (args[n], XmNpixmapForeground, black_pixel);       n++;
+         XtSetArg (args[n], XmNbackground, white_pixel);
+	 n++;
+         XtSetArg (args[n], XmNpixmapBackground, white_pixel);
+	 n++;
+         XtSetArg (args[n], XmNpixmapForeground, black_pixel);
+	 n++;
       }
       else if (background_color == black_pixel)
       {
-         XtSetArg (args[n], XmNbackground, black_pixel);             n++;
-         XtSetArg (args[n], XmNpixmapBackground, white_pixel);       n++;
-         XtSetArg (args[n], XmNpixmapForeground, black_pixel);       n++;
+         XtSetArg (args[n], XmNbackground, black_pixel);
+	 n++;
+         XtSetArg (args[n], XmNpixmapBackground, white_pixel);
+	 n++;
+         XtSetArg (args[n], XmNpixmapForeground, black_pixel);
+	 n++;
       }
       else
       {
-         XtSetArg (args[n], XmNbackground, background_color);        n++;
-         XtSetArg (args[n], XmNpixmapBackground, pixmap_background); n++;
-         XtSetArg (args[n], XmNpixmapForeground, pixmap_foreground); n++;
+         XtSetArg (args[n], XmNbackground, background_color);
+	 n++;
+         XtSetArg (args[n], XmNpixmapBackground, pixmap_background);
+	 n++;
+         XtSetArg (args[n], XmNpixmapForeground, pixmap_foreground);
+	 n++;
       }
 
       if (i - count < num_children)
       {
          icon_widget = mgr->composite.children[i - count];
-         XtSetArg (args[n], XmNx, x);                                   n++;
-         XtSetArg (args[n], XmNy, 5);                                   n++;
-         XtSetArg (args[n], XmNuserData, user_data);                    n++;
+         XtSetArg (args[n], XmNx, x);
+	 n++;
+         XtSetArg (args[n], XmNy, 5);
+	 n++;
+         XtSetArg (args[n], XmNuserData, user_data);
+	 n++;
          XtSetValues(icon_widget, args, n);
          XtRemoveAllCallbacks (icon_widget, XmNcallback);
 
       }
       else
       {
-         XtSetArg (args[n], XmNx, x);                                   n++;
-         XtSetArg (args[n], XmNy, 5);                                   n++;
-         XtSetArg (args[n], XmNshadowThickness, 2);                     n++;
-         XtSetArg (args[n], XmNfontList, user_font);                    n++;
+         XtSetArg (args[n], XmNx, x);
+	 n++;
+         XtSetArg (args[n], XmNy, 5);
+	 n++;
+         XtSetArg (args[n], XmNshadowThickness, 2);
+	 n++;
+         XtSetArg (args[n], XmNfontList, user_font);
+	 n++;
          if(keybdFocusPolicy == XmEXPLICIT)
          {
-            XtSetArg (args[n], XmNtraversalOn, True);                   n++;
+            XtSetArg (args[n], XmNtraversalOn, True);
+	    n++;
          }
          else
          {
-            XtSetArg (args[n], XmNtraversalOn, False);                  n++;
-            XtSetArg (args[n], XmNhighlightThickness, 0);               n++;
+            XtSetArg (args[n], XmNtraversalOn, False);
+	    n++;
+            XtSetArg (args[n], XmNhighlightThickness, 0);
+	    n++;
          }
-         XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE);           n++;
+         XtSetArg (args[n], XmNborderType, DtNON_RECTANGLE);
+	 n++;
          if (mgr->composite.num_children == 0)
          {
-            XtSetArg (args[n], XmNuserData, user_data);                 n++;
+            XtSetArg (args[n], XmNuserData, user_data);
+	    n++;
             icon_widget= _DtCreateIcon ((Widget)mgr, "icon", args, n);
          }
          else
@@ -984,8 +1013,10 @@ SetValues(
                           (XmString)args[0].value, (String)args[1].value,
                           (XtPointer)user_data, (Boolean)args[2].value);
             n = 0;
-            XtSetArg (args[n], XmNx, x);                                n++;
-            XtSetArg (args[n], XmNy, 5);                                n++;
+            XtSetArg (args[n], XmNx, x);
+	    n++;
+            XtSetArg (args[n], XmNy, 5);
+	    n++;
             XtSetValues(icon_widget, args, n);
          }
          XtAddCallback(icon_widget, XmNhelpCallback,
@@ -1020,18 +1051,25 @@ SetValues(
          /* Draw the selected icon as selected */
          if (background_color == white_pixel)
          {
-            XtSetArg (args[n], XmNbackground, black_pixel);             n++;
-            XtSetArg (args[n], XmNforeground, white_pixel);             n++;
+            XtSetArg (args[n], XmNbackground, black_pixel);
+	    n++;
+            XtSetArg (args[n], XmNforeground, white_pixel);
+	    n++;
          }
          else
          {
-            XtSetArg (args[n], XmNbackground, white_pixel);             n++;
-            XtSetArg (args[n], XmNforeground, black_pixel);             n++;
+            XtSetArg (args[n], XmNbackground, white_pixel);
+	    n++;
+            XtSetArg (args[n], XmNforeground, black_pixel);
+	    n++;
          }
 
-         XtSetArg (args[n], XmNpixmapBackground, white_pixel);          n++;
-         XtSetArg (args[n], XmNpixmapForeground, black_pixel);          n++;
-         XtSetArg (args[n], XmNarmColor, white_pixel);                  n++;
+         XtSetArg (args[n], XmNpixmapBackground, white_pixel);
+	 n++;
+         XtSetArg (args[n], XmNpixmapForeground, black_pixel);
+	 n++;
+         XtSetArg (args[n], XmNarmColor, white_pixel);
+	 n++;
          XtSetValues(icon_widget, args, n);
       }
    }
@@ -1054,7 +1092,8 @@ SetValues(
          {
             n = 0;
             XtSetArg(args[n], XmNy,
-                     5 + (max - mgr->composite.children[i]->core.height)); n++;
+                     5 + (max - mgr->composite.children[i]->core.height));
+	    n++;
             XtSetValues(mgr->composite.children[i], args, n);
          }
       }

cde/programs/dtfile/OverWrite.c

@@ -2159,7 +2159,7 @@ rename the file you are changing so it no longer has the same name.");
            }  /* end switch (mode) */
 
    }  /* end switch (message) */
-
+   return "";
 }  /* end getVariableMessage */
 
 static Boolean

cde/programs/dticon/image.c

@@ -61,6 +61,17 @@
 static int flood_min_x, flood_min_y, flood_max_x, flood_max_y;
 
 
+static void Set_FloodLimits(int x, int y);
+static void Flood_Fill(
+	XImage *color_image,
+        XImage *mono_image,
+        int x,
+        int y,
+        int width,
+        int height,
+        unsigned long new_pixel,
+        unsigned long new_mono);
+
 /***************************************************************************
  *                                                                         *
  * Routine:   Mirror_Image                                                 *
@@ -76,7 +87,6 @@ int
 Mirror_Image(
         int orientation )
 {
-  XRectangle tmp_box;
   XImage *new_image, *old_image, *new_mono, *old_mono;
   unsigned long n;
   int i, j;
@@ -416,7 +426,7 @@ Flood_Region(
  *                                                                         *
  *X11***********************************************************************/
 
-void
+static void
 Set_FloodLimits(
         int x,
         int y )
@@ -473,7 +483,7 @@ struct seg {short y, xl, xr, dy;};
   int local_debug=False, p_cnt;
 #endif
 
-int
+static void
 Flood_Fill(
         XImage *color_image,
         XImage *mono_image,
@@ -489,7 +499,7 @@ Flood_Fill(
   struct seg stack[MAX], *sp = stack;
 
   old_pixel = XGetPixel(color_image, x, y);	/* read pv at seed point */
-  if (old_pixel==new_pixel || x<0 || x>width || y<0 || y>height) return 0;
+  if (old_pixel==new_pixel || x<0 || x>width || y<0 || y>height) return;
   PUSH(y, x, x, 1);			/* needed in some cases */
   PUSH(y+1, x, x, -1);		/* seed segment (popped 1st) */
 

cde/programs/dticon/image.h

@@ -28,5 +28,3 @@ int Mirror_Image(int orientation);
 int Block_Rotate(XImage *src_image, XImage *dst_image, int rtype);
 void Scale_Image(void);
 int Flood_Region(int flood_x, int flood_y);
-void Set_FloodLimits(int x, int y);
-int Flood_Fill(XImage *color_image, XImage *mono_image, int x, int y, int width, int height, unsigned long new_pixel, unsigned long new_mono);

cde/programs/dtimsstart/file.c

@@ -637,10 +637,12 @@ int	read_selection_file(FileSel *fsel, FILE *fp)
 	    if (str_to_int(valp, &i) && i >= 0)
 		select_mode = i;
 	} else if (strncmp(lp + 1, STR_IMSNAME, 4) == 0) {
-	    vp = valp; cut_field(valp);
+	    vp = valp;
+	    cut_field(valp);
 	    RENEWSTR(imsname, vp);
 	} else if (strncmp(lp + 1, STR_HOSTNAME, 4) == 0) {
-	    vp = valp; cut_field(valp);
+	    vp = valp;
+	    cut_field(valp);
 	    FREE(hostname);
 	    if (strcmp(vp, NAME_LOCAL))
 		hostname = NEWSTR(vp);

cde/programs/dtimsstart/ximsfunc.h

@@ -223,9 +223,9 @@ void	*_mp_;
 #define	is_white(c)		((c) == ' ' || (c) == '\t' || (c) == '\n')
 #define	skip_white(p)		while (is_white(*(p)))	(p)++
 #define	next_field(p)	\
-	for ((p)++; *(p) && !is_white(*(p)); (p)++) ; skip_white(p)
+	do { for ((p)++; *(p) && !is_white(*(p)); (p)++) ; skip_white(p); } while (0)
 #define	cut_field(p)	\
-	for ((p)++; *(p) && !is_white(*(p)); (p)++) ; *(p)++ = 0; skip_white(p)
+	do { for ((p)++; *(p) && !is_white(*(p)); (p)++) ; *(p)++ = 0; skip_white(p); } while (0)
 
 	/* misc */
 #define Max(a, b)	((a) < (b) ? (b) : (a))

cde/programs/dtlogin/auth.c

@@ -1076,7 +1076,6 @@ SetUserAuthorization (struct display *d, struct verify_info *verify)
     int	lockStatus;
     Xauth	*entry, **auths;
     int	setenv;
-    char	**setEnv (), *getEnv ();
     struct stat	statb;
     int		i;
     int		magicCookie;
@@ -1257,7 +1256,6 @@ RemoveUserAuthorization (struct display *d, struct verify_info *verify)
     FILE    *old, *new;
     struct stat	statb;
     int	    i;
-    char    *getEnv ();
 
     if (!(auths = d->authorizations))
 	return;

cde/programs/dtlogin/daemon.c

@@ -46,6 +46,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#include <stdlib.h>
 #include <X11/Xos.h>
 #include <sys/ioctl.h>
 
@@ -53,9 +54,6 @@
 #include <termio.h>
 #endif
 
-extern void exit ();
-
-
 void
 BecomeDaemon( void )
 {

cde/programs/dtlogin/dm.h

@@ -848,7 +848,7 @@ extern int  source(
 /*******************************     socket.c	  **************************/
 
 extern int  AnyWellKnownSockets( void ) ;
-extern int  CreateWellKnownSockets( void ) ;
+extern void CreateWellKnownSockets( void ) ;
 extern void DestroyWellKnownSockets( void ) ;
 extern char * NetworkAddressToHostname( 
 #if NeedWidePrototypes

cde/programs/dtlogin/dtchooser.c

@@ -662,7 +662,7 @@ MakeDialog( DialogType dtype )
 
     int		width;
     
-    FILE	*fp = NULL, *fopen();
+    FILE	*fp = NULL;
     char	buffer[128];
     char	*str;
 

cde/programs/dtlogin/fontpath.c

@@ -142,7 +142,8 @@ ApplyFontPathMods( struct display *d, Display *dpy )
             for (s=fph, i=j=0; j<numHeads; j++) {
                 if (!PathInPList(s,newList,i))
                     newList[i++] = s;
-                while (*s) s++; s++;
+                while (*s) s++;
+		s++;
             }
             for (j=0; j<numPaths; j++) {
                 if (!PathInPList(fontPath[j],newList,i) &&
@@ -153,7 +154,8 @@ ApplyFontPathMods( struct display *d, Display *dpy )
             for (s=fpt, j=0; j<numTails; j++) {
                 if (!PathInPList(s,newList,i))
                     newList[i++] = s;   
-                while (*s) s++; s++;
+                while (*s) s++;
+		s++;
             }
             if (debugLevel > 0)
                 DebugFontPath("Request (XSetFontPath)",newList,i);
@@ -239,7 +241,8 @@ PathInZList(char *path, char *fplist, int listlen)
             s++; while (*s == '/') s++;
         }
         if (!*s && !*t) return 1;
-        while (*t) t++; t++;
+        while (*t) t++;
+	t++;
     }
     return 0;    
 }

cde/programs/dtlogin/socket.c

@@ -108,20 +108,20 @@ extern int	WellKnownSocketsMax;
 void registerHostname (char *name, int namelen); // xdmcp.c
 
 
-int
+void
 CreateWellKnownSockets (void)
 {
     struct sockaddr_in	sock_addr;
     char		*name, *localHostname();
 
     if (request_port == 0)
-	    return 0;
+	    return;
     Debug ("creating socket %d\n", request_port);
     xdmcpFd = socket (AF_INET, SOCK_DGRAM, 0);
     if (xdmcpFd == -1) {
 	LogError (ReadCatalog(MC_LOG_SET,MC_LOG_FAIL_SOCK,MC_DEF_LOG_FAIL_SOCK),
 		  request_port);
-	return 0;
+	return;
     }
     name = localHostname ();
     registerHostname (name, strlen (name));
@@ -140,7 +140,7 @@ CreateWellKnownSockets (void)
 		  request_port, errno);
 	close (xdmcpFd);
 	xdmcpFd = -1;
-	return 0;
+	return;
     }
     WellKnownSocketsMax = xdmcpFd;
     FD_SET (xdmcpFd, &WellKnownSocketsMask);
@@ -150,7 +150,7 @@ CreateWellKnownSockets (void)
     if (chooserFd == -1)
     {
 	LogError ((unsigned char *)"chooser socket creation failed, errno %d\n", errno);
-	return 0;
+	return;
     }
     listen (chooserFd, 5);
     if (chooserFd > WellKnownSocketsMax)

cde/programs/dtlogin/sysauth.c

@@ -990,7 +990,6 @@ Authenticate( struct display *d, char *name, char *passwd, char **msg )
     static int		login_attempts = 0; /* # failed authentications	   */
     
     struct passwd	*p;		/* password structure */
-    char 		*crypt();
 
     int			n;
 

cde/programs/dtlogin/verify.c

@@ -181,7 +181,7 @@ Verify(
         case NOTIFY_OK:
 	    if(d->session)
 	      argv = parseArgs (argv,d->session);
-              break;
+            break;
         case NOTIFY_ALT_DTS:
 	    if((argv = setDt(d,argv,notify_dt)) == NULL)
 		/*if no startup file, startup the regular desktop*/

cde/programs/dtlogin/vglang.c

@@ -49,6 +49,7 @@
  ***************************************************************************/
 
 #include	<stdio.h>
+#include	<string.h>
 #include	"vg.h"
 #include	"vgmsg.h"
 #include	<Xm/CascadeBG.h>

cde/programs/dtlogin/vgmain.c

@@ -1163,7 +1163,7 @@ MakeDialog( DialogType dtype )
 
     int		width;
     
-    FILE	*fp, *fopen();
+    FILE	*fp;
     char	buffer[128];
 
     Widget	w = NULL, text;