e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Eliminate use of word() and atword(). 

SVN revision: 28474
This commit is contained in:
Kim Woelders 2007-02-25 19:03:19 +00:00
parent 4071d88a87
commit 135ec74bf8
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/buttons.c
View File

@ -32,7 +32,6 @@
#include "file.h"
#include "grabs.h"
#include "iclass.h"
#include "parse.h"
#include "tclass.h"
#include "tooltips.h"
#include "xwin.h"
@ -712,14 +711,14 @@ ButtonsConfigLoad(FILE * ConfigFile)
char sticky = 0;
char show = 1;
char internal = 0;
int fields;
const char *ss;
int fields, len;
while (GetLine(s, sizeof(s), ConfigFile))
{
s2[0] = 0;
i1 = CONFIG_INVALID;
fields = sscanf(s, "%i %4000s", &i1, s2);
len = 0;
fields = sscanf(s, "%i %4000s %n", &i1, s2, &len);
if (fields < 1)
{
@ -762,8 +761,7 @@ ButtonsConfigLoad(FILE * ConfigFile)
break;
case BUTTON_LABEL:
_EFREE(label);
ss = atword(s, 2);
label = Estrdup(ss);
label = Estrdup(s + len);
if (pbt)
{
_EFREE(pbt->label);
@ -1047,10 +1045,11 @@ _ButtonHideShow(void *data, void *prm)
static void
doHideShowButton(const char *params)
{
Button *b;
char s[1024];
const char *ss;
int len;
button_match_data bmd = { -1, 1, NULL };
Button *b;
if (!params)
{
@ -1059,7 +1058,11 @@ doHideShowButton(const char *params)
goto done;
}
sscanf(params, "%1000s", s);
s[0] = '\0';
len = 0;
sscanf(params, "%1000s %n", s, &len);
ss = (len > 0) ? params + len : NULL;
if (!strcmp(s, "button"))
{
sscanf(params, "%*s %1000s", s);
@ -1069,7 +1072,6 @@ doHideShowButton(const char *params)
}
else if (!strcmp(s, "buttons"))
{
ss = atword(params, 2);
if (!ss)
return;
@ -1078,7 +1080,6 @@ doHideShowButton(const char *params)
}
else if (!strcmp(s, "all_buttons_except"))
{
ss = atword(params, 2);
if (!ss)
return;

12
src/fx.c
View File

@ -25,7 +25,6 @@
#include "dialog.h"
#include "eimage.h"
#include "emodule.h"
#include "parse.h"
#include "settings.h"
#include "timers.h"
#include "xwin.h"
@ -927,21 +926,18 @@ const DialogDef DlgFx = {
static void
FxIpc(const char *params, Client * c __UNUSED__)
{
char word1[FILEPATH_LEN_MAX];
char word2[FILEPATH_LEN_MAX];
char word1[1024];
char word2[1024];
if (!params)
return;
word1[0] = '\0';
word2[0] = '\0';
word(params, 1, word1);
word1[0] = word2[0] = '\0';
sscanf(params, "%1000s %1000s", word1, word2);
if (!strcmp(word1, "raindrops") || !strcmp(word1, "ripples") ||
!strcmp(word1, "waves"))
{
word(params, 2, word2);
if (!strcmp(word2, ""))
FX_Op(word1, FX_OP_TOGGLE);
else if (!strcmp(word2, "on"))

21
src/snaps.c
View File

@ -29,7 +29,6 @@
#include "ewins.h"
#include "file.h"
#include "groups.h"
#include "parse.h"
#include "settings.h"
#include "snaps.h"
#include "timers.h"
@ -1538,16 +1537,26 @@ SnapshotEwinUnmatch(EWin * ewin)
void
SnapshotEwinParse(EWin * ewin, const char *params)
{
char param[FILEPATH_LEN_MAX];
char param[1024];
const char *p;
int len;
unsigned int match_flags, use_flags;
p = params;
if (!p)
return;
match_flags = SNAP_MATCH_DEFAULT;
use_flags = 0;
for (; params;)
for (;;)
{
param[0] = 0;
word(params, 1, param);
param[0] = '\0';
len = 0;
sscanf(p, "%s %n", param, &len);
if (len <= 0)
break;
p += len;
if (!strcmp(param, "all"))
{
@ -1586,8 +1595,6 @@ SnapshotEwinParse(EWin * ewin, const char *params)
#endif
else if (!strcmp(param, "group"))
use_flags |= SNAP_USE_GROUPS;
params = atword(params, 2);
}
if (ewin->snap)

16
src/windowmatch.c
View File

@ -29,7 +29,6 @@
#include "emodule.h"
#include "ewins.h"
#include "ewin-ops.h"
#include "parse.h"
#include "windowmatch.h"
typedef struct _windowmatch WindowMatch;
@ -143,15 +142,15 @@ WindowMatchConfigLoad(FILE * fs)
WindowMatch *wm = 0;
char s[FILEPATH_LEN_MAX];
char s2[FILEPATH_LEN_MAX];
const char *ss;
int i1;
int fields;
int fields, len;
while (GetLine(s, sizeof(s), fs))
{
s2[0] = 0;
i1 = CONFIG_INVALID;
fields = sscanf(s, "%i %4000s", &i1, s2);
len = 0;
fields = sscanf(s, "%i %4000s %n", &i1, s2, &len);
if (fields < 1)
i1 = CONFIG_INVALID;
@ -191,22 +190,19 @@ WindowMatchConfigLoad(FILE * fs)
if (!wm)
break;
wm->match = MATCH_TYPE_TITLE;
ss = atword(s, 2);
wm->value = Estrdup(ss);
wm->value = Estrdup(s + len);
break;
case WINDOWMATCH_MATCHNAME:
if (!wm)
break;
wm->match = MATCH_TYPE_WM_NAME;
ss = atword(s, 2);
wm->value = Estrdup(ss);
wm->value = Estrdup(s + len);
break;
case WINDOWMATCH_MATCHCLASS:
if (!wm)
break;
wm->match = MATCH_TYPE_WM_CLASS;
ss = atword(s, 2);
wm->value = Estrdup(ss);
wm->value = Estrdup(s + len);
break;
case WINDOWMATCH_WIDTH: