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-30 20:24:04 +01:00
parent e12e009eb5
commit e507de959e
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,11 +44,6 @@
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <Xm/Protocols.h> #include <Xm/Protocols.h>
#define FREE (void) free
#define FPRINTF (void) fprintf
#define GETHOSTNAME (void) gethostname
#define SPRINTF (void) sprintf
#define STRCPY (void) strcpy
#define EQUAL(a, b) !strncmp(a, b, strlen(b)) #define EQUAL(a, b) !strncmp(a, b, strlen(b))
#define MAXLINE 120 /* Maximum length for character strings. */ #define MAXLINE 120 /* Maximum length for character strings. */
@ -153,7 +148,7 @@ ds_load_resources(Display *display)
db = XrmGetStringDatabase(XResourceManagerString(display)) ; db = XrmGetStringDatabase(XResourceManagerString(display)) ;
else else
{ {
SPRINTF(name, "%s/.Xdefaults", home) ; snprintf(name, sizeof(name), "%s/.Xdefaults", home) ;
db = XrmGetFileDatabase(name) ; db = XrmGetFileDatabase(name) ;
} }
XrmMergeDatabases(db, &rDB) ; XrmMergeDatabases(db, &rDB) ;
@ -166,7 +161,7 @@ ds_load_resources(Display *display)
{ {
snprintf(name, sizeof(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) ;
} }
else db = XrmGetFileDatabase(ptr) ; else db = XrmGetFileDatabase(ptr) ;
@ -267,7 +262,7 @@ ds_save_resources(XrmDatabase rDB, char *filename)
{ {
home = getenv("HOME") ; home = getenv("HOME") ;
filename = (char*) calloc(1, strlen(home) + 18) ; filename = (char*) calloc(1, strlen(home) + 18) ;
SPRINTF(filename, "%s/.dtcalcdef", home) ; snprintf(filename, sizeof(filename), "%s/.dtcalcdef", home) ;
} }
} }
@ -275,14 +270,14 @@ ds_save_resources(XrmDatabase rDB, char *filename)
if (stat(filename, &statbuf) != -1 && access(filename, W_OK) != 0) if (stat(filename, &statbuf) != -1 && access(filename, W_OK) != 0)
{ {
FREE(filename) ; free(filename) ;
return(1) ; return(1) ;
} }
/* If file does not exist this call will create it. */ /* If file does not exist this call will create it. */
XrmPutFileDatabase(rDB, filename) ; XrmPutFileDatabase(rDB, filename) ;
FREE(filename) ; free(filename) ;
return(0) ; return(0) ;
} }

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

@ -1984,8 +1984,8 @@ get_next_event(Widget widget, int ev_action, XEvent *xevent)
else if (ksym == XK_Meta_R && 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_L && up) return(ALT);
else if (ksym == XK_Alt_L && down) return(ALT); else if (ksym == XK_Alt_R && down) return(ALT);
else if (ksym == XK_Alt_R && up) return(ALT); else if (ksym == XK_Alt_R && up) return(ALT);
else if (ksym == XK_Select && down) return(SPACE); else if (ksym == XK_Select && down) return(SPACE);
else if (ksym == XK_Select && up) return(SPACE); else if (ksym == XK_Select && up) return(SPACE);