external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtcalc: resolve coverity issues

Browse source
This commit is contained in:
Peter Howkins 2018-03-28 02:24:27 +01:00
parent 0b93afd2ca
commit f65f512981
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cde/programs/dtcalc/ds_xlib.c
View file

@ -95,14 +95,14 @@ ds_get_resource(XrmDatabase rDB, char *appname, char *resource)
char *str_type[20] ; char *str_type[20] ;
XrmValue value ; XrmValue value ;
STRCPY(app, appname) ; snprintf(app, sizeof(app), "%s", appname) ;
STRCPY(res, resource) ; snprintf(res, sizeof(res), "%s", resource) ;
if (isupper(app[0])) app[0] = tolower(app[0]) ; if (isupper(app[0])) app[0] = tolower(app[0]) ;
SPRINTF(nstr, "%s.%s", app, res) ; snprintf(nstr, sizeof(nstr), "%s.%s", app, res) ;
if (islower(res[0])) res[0] = toupper(res[0]) ; if (islower(res[0])) res[0] = toupper(res[0]) ;
if (islower(app[0])) app[0] = toupper(app[0]) ; if (islower(app[0])) app[0] = toupper(app[0]) ;
SPRINTF(cstr, "%s.%s", app, res) ; snprintf(cstr, sizeof(cstr), "%s.%s", app, res) ;
if (XrmGetResource(rDB, nstr, cstr, str_type, &value) == 0) if (XrmGetResource(rDB, nstr, cstr, str_type, &value) == 0)
return((char *) NULL) ; return((char *) NULL) ;
@ -164,7 +164,7 @@ ds_load_resources(Display *display)
if ((ptr = getenv("XENVIRONMENT")) == NULL) if ((ptr = getenv("XENVIRONMENT")) == NULL)
{ {
SPRINTF(name, "%s/.Xdefaults-", home) ; snprintf(name, sizeof(name), "%s/.Xdefaults-", home) ;
len = strlen(name) ; len = strlen(name) ;
GETHOSTNAME(name+len, 1024-len) ; GETHOSTNAME(name+len, 1024-len) ;
db = XrmGetFileDatabase(name) ; db = XrmGetFileDatabase(name) ;
@ -211,9 +211,9 @@ ds_put_resource(XrmDatabase *rDB, char *appname, char *rstr, char *rval)
{ {
char app[MAXLINE], resource[MAXLINE] ; char app[MAXLINE], resource[MAXLINE] ;
STRCPY(app, appname) ; snprintf(app, sizeof(app), "%s", appname) ;
if (isupper(app[0])) app[0] = tolower(app[0]) ; if (isupper(app[0])) app[0] = tolower(app[0]) ;
SPRINTF(resource, "%s.%s", app, rstr) ; snprintf(resource, sizeof(resource), "%s.%s", app, rstr) ;
XrmPutStringResource(rDB, resource, rval) ; XrmPutStringResource(rDB, resource, rval) ;
} }

9
cde/programs/dtcalc/motif.c
View file

@ -1760,10 +1760,12 @@ event_proc(Widget widget, XtPointer client_data, XEvent *event, Boolean *continu
v->cur_ch == KEY_6 || v->cur_ch == KEY_6 ||
v->cur_ch == KEY_7) v->cur_ch == KEY_7)
return; return;
/* intentional fall through */
case OCT: case OCT:
if(v->cur_ch == KEY_8 || if(v->cur_ch == KEY_8 ||
v->cur_ch == KEY_9) v->cur_ch == KEY_9)
return; return;
/* intentional fall through */
case DEC: case DEC:
if(v->cur_ch == KEY_A || if(v->cur_ch == KEY_A ||
v->cur_ch == KEY_B || v->cur_ch == KEY_B ||
@ -1772,6 +1774,7 @@ event_proc(Widget widget, XtPointer client_data, XEvent *event, Boolean *continu
v->cur_ch == KEY_E || v->cur_ch == KEY_E ||
v->cur_ch == KEY_F) v->cur_ch == KEY_F)
return; return;
/* intentional fall through */
default: /* HEX, allow all keys */ default: /* HEX, allow all keys */
break; break;
} }
@ -1977,8 +1980,8 @@ get_next_event(Widget widget, int ev_action, XEvent *xevent)
else if (ksym == XK_Control_R && down) return(CONTROL); else if (ksym == XK_Control_R && down) return(CONTROL);
else if (ksym == XK_Control_R && up) return(CONTROL); else if (ksym == XK_Control_R && up) return(CONTROL);
else if (ksym == XK_Meta_L && down) return(META); else if (ksym == XK_Meta_L && down) return(META);
else if (ksym == XK_Meta_R && up) return(META); else if (ksym == XK_Meta_L && up) return(META);
else if (ksym == XK_Meta_L && down) return(META); else if (ksym == XK_Meta_R && down) return(META);
else if (ksym == XK_Meta_R && up) return(META); else if (ksym == XK_Meta_R && up) return(META);
else if (ksym == XK_Alt_L && down) return(ALT); else if (ksym == XK_Alt_L && down) return(ALT);
else if (ksym == XK_Alt_R && up) return(ALT); else if (ksym == XK_Alt_R && up) return(ALT);
@ -2477,7 +2480,7 @@ set_item(enum item_type itemno, char *str)
{ {
Widget w ; Widget w ;
XmString cstr ; XmString cstr ;
char *tmpStr, *ptr, displayStr[50]; char *tmpStr, *ptr, displayStr[50] = "";
if (itemno == DISPLAYITEM) if (itemno == DISPLAYITEM)
{ {