From 7ab683d29a6c8228859187a3411028fadddd4054 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 9 Dec 2025 22:38:19 +0100 Subject: [PATCH] handle missing return values --- cde/include/Dt/Search.h | 2 +- cde/lib/DtHelp/FormatSDL.c | 2 +- cde/lib/DtHelp/Graphics.c | 4 ++++ cde/lib/DtHelp/Selection.c | 2 +- cde/lib/DtHelp/il/ilpipe.c | 1 + cde/lib/DtSearch/ausexit.c | 1 + cde/lib/DtSearch/dtsrjoint.c | 6 ++---- cde/lib/DtSvc/DtUtil1/ActionTt.c | 7 +++---- cde/lib/csa/connection.c | 1 + cde/lib/csa/match.c | 2 +- cde/programs/dtcm/server/cmscalendar.c | 12 +++--------- cde/programs/dtcreate/FileCharacteristics.c | 1 + cde/programs/dtdocbook/instant/tables.c | 1 + cde/programs/dtfile/OverWrite.c | 2 +- cde/programs/dticon/image.c | 18 ++++++++++++++---- cde/programs/dticon/image.h | 2 -- cde/programs/dtlogin/dm.h | 2 +- cde/programs/dtlogin/socket.c | 10 +++++----- cde/programs/dtpad/main.c | 2 ++ cde/programs/dtpdm/PdmOid.c | 4 +--- cde/programs/dtprintinfo/libUI/MotifUI/Icon.c | 1 + cde/programs/dtstyle/ColorEdit.c | 6 ++---- 22 files changed, 48 insertions(+), 41 deletions(-) diff --git a/cde/include/Dt/Search.h b/cde/include/Dt/Search.h index 57c35dee5..b698f1361 100644 --- a/cde/include/Dt/Search.h +++ b/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); diff --git a/cde/lib/DtHelp/FormatSDL.c b/cde/lib/DtHelp/FormatSDL.c index a6b960e99..59a04eca9 100644 --- a/cde/lib/DtHelp/FormatSDL.c +++ b/cde/lib/DtHelp/FormatSDL.c @@ -8732,7 +8732,7 @@ FormatSDLTitle( * Purpose: * ******************************************************************************/ -static int +static void SetGhostLink( _DtCvLinkDb link_data, _DtCvSegment *segments, diff --git a/cde/lib/DtHelp/Graphics.c b/cde/lib/DtHelp/Graphics.c index f9b77b9d1..6a1425f3a 100644 --- a/cde/lib/DtHelp/Graphics.c +++ b/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; } diff --git a/cde/lib/DtHelp/Selection.c b/cde/lib/DtHelp/Selection.c index 1ea52dcc9..c4c3cebbc 100644 --- a/cde/lib/DtHelp/Selection.c +++ b/cde/lib/DtHelp/Selection.c @@ -379,7 +379,7 @@ SkipOtherLines( * Function: CheckAndSwitchPoints * *****************************************************************************/ -static int +static void CheckAndSwitchPoints( _DtCvSelectData *pt1, _DtCvSelectData *pt2) diff --git a/cde/lib/DtHelp/il/ilpipe.c b/cde/lib/DtHelp/il/ilpipe.c index d1089cac6..a537f29d2 100644 --- a/cde/lib/DtHelp/il/ilpipe.c +++ b/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; } diff --git a/cde/lib/DtSearch/ausexit.c b/cde/lib/DtSearch/ausexit.c index 62974da4f..602e726ee 100644 --- a/cde/lib/DtSearch/ausexit.c +++ b/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) diff --git a/cde/lib/DtSearch/dtsrjoint.c b/cde/lib/DtSearch/dtsrjoint.c index cc6ab1d87..7869f6dbc 100644 --- a/cde/lib/DtSearch/dtsrjoint.c +++ b/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() */ diff --git a/cde/lib/DtSvc/DtUtil1/ActionTt.c b/cde/lib/DtSvc/DtUtil1/ActionTt.c index ee556fb18..6e8bc47cf 100644 --- a/cde/lib/DtSvc/DtUtil1/ActionTt.c +++ b/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; } /****************************************************************************** diff --git a/cde/lib/csa/connection.c b/cde/lib/csa/connection.c index baa01c62c..9972cbb60 100644 --- a/cde/lib/csa/connection.c +++ b/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; } diff --git a/cde/lib/csa/match.c b/cde/lib/csa/match.c index 95dd7c5e2..8f020c311 100644 --- a/cde/lib/csa/match.c +++ b/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); } } diff --git a/cde/programs/dtcm/server/cmscalendar.c b/cde/programs/dtcm/server/cmscalendar.c index 6c6a47b88..bf8b7915e 100644 --- a/cde/programs/dtcm/server/cmscalendar.c +++ b/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 diff --git a/cde/programs/dtcreate/FileCharacteristics.c b/cde/programs/dtcreate/FileCharacteristics.c index 43b0641b3..c9a264df2 100644 --- a/cde/programs/dtcreate/FileCharacteristics.c +++ b/cde/programs/dtcreate/FileCharacteristics.c @@ -173,6 +173,7 @@ ushort GetContentsType(void) return((ushort)CA_FT_CNTLONG); } /* NOTREACHED */ + return -1; } /******************************************************************************/ diff --git a/cde/programs/dtdocbook/instant/tables.c b/cde/programs/dtdocbook/instant/tables.c index e8b7f7018..998ab287e 100644 --- a/cde/programs/dtdocbook/instant/tables.c +++ b/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 diff --git a/cde/programs/dtfile/OverWrite.c b/cde/programs/dtfile/OverWrite.c index 1026e62fe..c8c1881a1 100644 --- a/cde/programs/dtfile/OverWrite.c +++ b/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 diff --git a/cde/programs/dticon/image.c b/cde/programs/dticon/image.c index e28d1366f..50fa25062 100644 --- a/cde/programs/dticon/image.c +++ b/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) */ diff --git a/cde/programs/dticon/image.h b/cde/programs/dticon/image.h index 3c78c25b8..9470a44ba 100644 --- a/cde/programs/dticon/image.h +++ b/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); diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index 345c56cb1..5dd3330ee 100644 --- a/cde/programs/dtlogin/dm.h +++ b/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 diff --git a/cde/programs/dtlogin/socket.c b/cde/programs/dtlogin/socket.c index 4a3ee19f3..be393b288 100644 --- a/cde/programs/dtlogin/socket.c +++ b/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) diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c index 72ccbc818..bb2507a5f 100644 --- a/cde/programs/dtpad/main.c +++ b/cde/programs/dtpad/main.c @@ -1738,7 +1738,9 @@ HostCB(Tt_message m, Tt_pattern p) if (state == TT_HANDLED) { value = tt_message_arg_val(m, 1); waitCB = 0; + return TT_CALLBACK_PROCESSED; } + return TT_CALLBACK_CONTINUE; } /************************************************************************ diff --git a/cde/programs/dtpdm/PdmOid.c b/cde/programs/dtpdm/PdmOid.c index c142f71e6..8102b8b33 100644 --- a/cde/programs/dtpdm/PdmOid.c +++ b/cde/programs/dtpdm/PdmOid.c @@ -1654,14 +1654,12 @@ const char* PdmOidNotifyString(PdmOidNotify notify) { case PDMOID_NOTIFY_UNSUPPORTED: return (const char*)NULL; - break; case PDMOID_NOTIFY_NONE: return NOTIFY_NONE_STR; - break; case PDMOID_NOTIFY_EMAIL: return NOTIFY_EMAIL_STR; - break; } + return (const char*)NULL; } /* diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c b/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c index 2dcbff241..d862d7d1f 100644 --- a/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c +++ b/cde/programs/dtprintinfo/libUI/MotifUI/Icon.c @@ -2049,6 +2049,7 @@ QueryGeometry( desired->width = 1; if (desired->height == 0) desired->height = 1; + return XtGeometryYes; } /* diff --git a/cde/programs/dtstyle/ColorEdit.c b/cde/programs/dtstyle/ColorEdit.c index 0f5b3bca9..684b3b210 100644 --- a/cde/programs/dtstyle/ColorEdit.c +++ b/cde/programs/dtstyle/ColorEdit.c @@ -1409,8 +1409,7 @@ max( if(y >= z && y >= x) return(y); - if(z >= y && z >= x) - return(z); + return(z); } /************************************************************************ @@ -1429,8 +1428,7 @@ min( if(y <= z && y <= x) return(y); - if(z <= y && z <= x) - return(z); + return(z); } /************************************************************************