diff options
| author | Walter Harms <wharms@bfs.de> | 2019-06-09 18:26:23 +0200 |
|---|---|---|
| committer | Walter Harms <wharms@bfs.de> | 2019-06-09 18:26:23 +0200 |
| commit | 9f556b46f0009e58a2c30c3ba3c9f223ae9f6255 (patch) | |
| tree | 6d20e17c82105501453f6bdc3f2a726c091ae966 /src | |
| parent | 7c0ed275e4c0e86e23c5f93647e03fa4b71797b3 (diff) | |
| download | xorg-lib-libXt-9f556b46f0009e58a2c30c3ba3c9f223ae9f6255.tar.gz | |
no need to check argument for X(t)Free
Signed-off-by: Walter Harms <wharms@bfs.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ResConfig.c | 15 | ||||
| -rw-r--r-- | src/TMkey.c | 11 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/ResConfig.c b/src/ResConfig.c index 169b22f..b668736 100644 --- a/src/ResConfig.c +++ b/src/ResConfig.c @@ -207,8 +207,8 @@ _set_resource_values ( cur->core.widget_class->core_class.class_name); } } - if (resource_class != NULL) - XtFree (resource_class); + + XtFree (resource_class); resource_class = temp; cur = XtParent(cur); @@ -219,8 +219,8 @@ _set_resource_values ( */ XtAsprintf (&temp, "%s.%s", resource_name, resources_return[res_index].resource_name); - if (resource_name != NULL) - XtFree (resource_name); + + XtFree (resource_name); resource_name = temp; /* @@ -228,8 +228,8 @@ _set_resource_values ( */ XtAsprintf (&temp, "%s.%s", resource_class, resources_return[res_index].resource_class); - if (resource_class != NULL) - XtFree (resource_class); + + XtFree (resource_class); resource_class = temp; #ifdef DEBUG @@ -1008,6 +1008,5 @@ _XtResourceConfigurationEH ( } } - if (data) - XFree ((char *)data); + XFree ((char *)data); } diff --git a/src/TMkey.c b/src/TMkey.c index c1f8948..06924ac 100644 --- a/src/TMkey.c +++ b/src/TMkey.c @@ -435,20 +435,19 @@ void _XtBuildKeysymTables( #define KeysymTableSize 16 FLUSHKEYCACHE(pd->tm_context); - if (pd->keysyms) - XFree( (char *)pd->keysyms ); + + XFree( (char *)pd->keysyms ); pd->keysyms_serial = NextRequest(dpy); pd->keysyms = XGetKeyboardMapping(dpy, (KeyCode) pd->min_keycode, pd->max_keycode-pd->min_keycode+1, &pd->keysyms_per_keycode); - if (pd->modKeysyms) - XtFree((char *)pd->modKeysyms); - if (pd->modsToKeysyms) - XtFree((char *)pd->modsToKeysyms); + XtFree((char *)pd->modKeysyms); + pd->modKeysyms = (KeySym*)__XtMalloc((Cardinal)KeysymTableSize*sizeof(KeySym)); maxCount = KeysymTableSize; tempCount = 0; + XtFree((char *)pd->modsToKeysyms); table = (ModToKeysymTable*)__XtMalloc((Cardinal)8*sizeof(ModToKeysymTable)); pd->modsToKeysyms = table; |