gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-30 12:15:50 +01:00
Code Issues Projects Releases Wiki Activity

WPrefs: Remove trimstr() and use wtrimspace() from WINGs

Browse Source 
There's no need to have a private function while there's one in WINGs.

Besides that, it does not remove trailing whitespaces appropriately as I
just tested by adding trailing space in the shortcut captured by WPrefs.
It is not trimmed before saving it:

[mafra@Pilar:Defaults]$ grep CloseKey WindowMaker
  CloseKey = "Mod1+C    ";

Using wtrimspace() fixes that and even saves 208 bytes of code:

[mafra@Pilar:WPrefs.app]$ size KeyboardShortcuts.o.*
   text    data     bss     dec     hex filename
   7703       0       0    7703    1e17 KeyboardShortcuts.o.new
   7911       0       0    7911    1ee7 KeyboardShortcuts.o.old

Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Carlos R. Mafra
2012-01-19 01:12:58 +00:00
parent 171eca8b64
commit 69d2e51876
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
WPrefs.app/KeyboardShortcuts.c
View File

@@ -359,23 +359,6 @@ static void listClick(WMWidget * w, void *data)
WMSetTextFieldText(panel->shoT, panel->shortcuts[row]); WMSetTextFieldText(panel->shoT, panel->shortcuts[row]);
} }
static char *trimstr(char *str)
{
char *p = str;
int i;
while (isspace(*p))
p++;
p = wstrdup(p);
i = strlen(p);
while (isspace(p[i]) && i > 0) {
p[i] = 0;
i--;
}
return p;
}
static void showData(_Panel * panel) static void showData(_Panel * panel)
{ {
char *str; char *str;
@@ -387,7 +370,7 @@ static void showData(_Panel * panel)
if (panel->shortcuts[i]) if (panel->shortcuts[i])
wfree(panel->shortcuts[i]); wfree(panel->shortcuts[i]);
if (str) if (str)
panel->shortcuts[i] = trimstr(str); panel->shortcuts[i] = wtrimspace(str);
else else
panel->shortcuts[i] = NULL; panel->shortcuts[i] = NULL;
@@ -574,7 +557,7 @@ static void storeData(_Panel * panel)
for (i = 0; i < panel->actionCount; i++) { for (i = 0; i < panel->actionCount; i++) {
str = NULL; str = NULL;
if (panel->shortcuts[i]) { if (panel->shortcuts[i]) {
str = trimstr(panel->shortcuts[i]); str = wtrimspace(panel->shortcuts[i]);
if (strlen(str) == 0) { if (strlen(str) == 0) {
wfree(str); wfree(str);
str = NULL; str = NULL;