From 6cc7e4a7f6ef2ba514a1c8cafc476f9ffc80548a Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Wed, 19 Jan 2000 17:43:41 +0000 Subject: zsh-workers/9373 --- Src/Modules/parameter.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'Src/Modules') diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c index b67d9557c..47fffde69 100644 --- a/Src/Modules/parameter.c +++ b/Src/Modules/parameter.c @@ -1086,12 +1086,12 @@ scanpmhistory(HashTable ht, ScanFunc func, int flags) pm.level = 0; while (he) { - if (func != scancountparams && - ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || - !(flags & SCANPM_WANTKEYS))) { + if (func != scancountparams) { sprintf(buf, "%d", he->histnum); pm.nam = dupstring(buf); - pm.u.str = dupstring(he->text); + if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || + !(flags & SCANPM_WANTKEYS)) + pm.u.str = dupstring(he->text); } func((HashNode) &pm, flags); @@ -1209,12 +1209,13 @@ scanpmjobtexts(HashTable ht, ScanFunc func, int flags) for (job = 1; job < MAXJOB; job++) { if (jobtab[job].stat && jobtab[job].procs && !(jobtab[job].stat & STAT_NOPRINT)) { - sprintf(buf, "%d", job); - pm.nam = dupstring(buf); - if (func != scancountparams && - ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || - !(flags & SCANPM_WANTKEYS))) - pm.u.str = pmjobtext(job); + if (func != scancountparams) { + sprintf(buf, "%d", job); + pm.nam = dupstring(buf); + if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || + !(flags & SCANPM_WANTKEYS)) + pm.u.str = pmjobtext(job); + } func((HashNode) &pm, flags); } } @@ -1314,12 +1315,13 @@ scanpmjobstates(HashTable ht, ScanFunc func, int flags) for (job = 1; job < MAXJOB; job++) { if (jobtab[job].stat && jobtab[job].procs && !(jobtab[job].stat & STAT_NOPRINT)) { - sprintf(buf, "%d", job); - pm.nam = dupstring(buf); - if (func != scancountparams && - ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || - !(flags & SCANPM_WANTKEYS))) - pm.u.str = pmjobstate(job); + if (func != scancountparams) { + sprintf(buf, "%d", job); + pm.nam = dupstring(buf); + if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || + !(flags & SCANPM_WANTKEYS)) + pm.u.str = pmjobstate(job); + } func((HashNode) &pm, flags); } } @@ -1391,12 +1393,13 @@ scanpmjobdirs(HashTable ht, ScanFunc func, int flags) for (job = 1; job < MAXJOB; job++) { if (jobtab[job].stat && jobtab[job].procs && !(jobtab[job].stat & STAT_NOPRINT)) { - sprintf(buf, "%d", job); - pm.nam = dupstring(buf); - if (func != scancountparams && - ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || - !(flags & SCANPM_WANTKEYS))) - pm.u.str = pmjobdir(job); + if (func != scancountparams) { + sprintf(buf, "%d", job); + pm.nam = dupstring(buf); + if ((flags & (SCANPM_WANTVALS|SCANPM_MATCHVAL)) || + !(flags & SCANPM_WANTKEYS)) + pm.u.str = pmjobdir(job); + } func((HashNode) &pm, flags); } } -- cgit 1.4.1