suckless/sbase
1
0
Fork 0
mirror of git://git.suckless.org/sbase synced 2024-12-22 07:01:15 +00:00
Code Issues Projects Releases Wiki Activity

code-style: minor cleanup and nitpicking

Browse Source
This commit is contained in:
Hiltjo Posthuma 2015-02-20 13:28:24 +01:00
parent 6c7ff5fda5
commit 31f0624f3d
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env.c
View File

@ -20,7 +20,7 @@ main(int argc, char *argv[])
{
ARGBEGIN {
case 'i':
if(environ)
if (environ)
*environ = NULL;
break;
case 'u':

6
expr.c
View File

@ -80,10 +80,10 @@ doop(int *op, int **opp, Val *val, Val **valp)
break;
case '=': ret = (Val){ NULL, valcmp(a, b) == 0 }; break;
case '>': ret = (Val){ NULL, valcmp(a, b) > 0 }; break;
case GE : ret = (Val){ NULL, valcmp(a, b) >= 0 }; break;
case GE: ret = (Val){ NULL, valcmp(a, b) >= 0 }; break;
case '<': ret = (Val){ NULL, valcmp(a, b) < 0 }; break;
case LE : ret = (Val){ NULL, valcmp(a, b) <= 0 }; break;
case NE : ret = (Val){ NULL, valcmp(a, b) != 0 }; break;
case LE: ret = (Val){ NULL, valcmp(a, b) <= 0 }; break;
case NE: ret = (Val){ NULL, valcmp(a, b) != 0 }; break;
case '+': enan(a); enan(b); ret = (Val){ NULL, a.n + b.n }; break;
case '-': enan(a); enan(b); ret = (Val){ NULL, a.n - b.n }; break;

2
logger.c
View File

@ -69,7 +69,7 @@ main(int argc, char *argv[])
openlog(tag ? tag : getlogin(), logflags, 0);
if (argc == 0) {
while(getline(&buf, &sz, stdin) != -1)
while (getline(&buf, &sz, stdin) != -1)
syslog(priority, "%s", buf);
if (ferror(stdin))
eprintf("%s: read error:", "<stdin>");

20
sed.c
View File

@ -820,6 +820,7 @@ char *
get_s_arg(Cmd *c, char *s)
{
Rune delim, r;
Cmd buf;
char *p;
int esc;
@ -901,13 +902,13 @@ get_s_arg(Cmd *c, char *s)
for (; s < p; s++) {
if (isdigit(*s)) {
c->u.s.occurrence = stol(s, &s);
} else switch (*s) {
case 'p' : c->u.s.p = 1; break;
case 'g' : c->u.s.occurrence = 0; break;
case 'w' : {
} else {
switch (*s) {
case 'g': c->u.s.occurrence = 0; break;
case 'p': c->u.s.p = 1; break;
case 'w':
/* must be last flag, take everything up to newline/semicolon
* s == p after this */
Cmd buf;
s = get_w_arg(&buf, s);
c->u.s.file = buf.u.file;
break;
@ -927,7 +928,6 @@ free_s_arg(Cmd *c)
free(c->u.s.repl.str);
}
/* see get_r_arg notes */
char *
get_w_arg(Cmd *c, char *s)
@ -1092,13 +1092,13 @@ match_addr(Addr *a)
switch (a->type) {
default:
case IGNORE: return 0;
case EVERY : return 1;
case LINE : return lineno == a->u.lineno;
case LAST :
case EVERY: return 1;
case LINE: return lineno == a->u.lineno;
case LAST:
while (is_eof(file) && !next_file())
;
return !file;
case REGEX :
case REGEX:
lastre = a->u.re;
return !regexec(a->u.re, patt.str, 0, NULL, 0);
case LASTRE:

2
seq.c
View File

@ -27,7 +27,7 @@ main(int argc, char *argv[])
ARGBEGIN {
case 'f':
if(!validfmt(tmp=EARGF(usage())))
if (!validfmt(tmp=EARGF(usage())))
eprintf("%s: invalid format\n", tmp);
fmt = tmp;
break;

4
sort.c
View File

@ -254,7 +254,7 @@ parse_keydef(struct keydef *kd, char *s, int flags)
static char *
skipblank(char *s)
{
while(*s && isblank(*s))
while (*s && isblank(*s))
s++;
return s;
}
@ -264,7 +264,7 @@ nextcol(char *s)
{
if (!fieldsep) {
s = skipblank(s);
while(*s && !isblank(*s))
while (*s && !isblank(*s))
s++;
} else {
if (!strchr(s, *fieldsep))

2
tail.c
View File

@ -130,7 +130,7 @@ main(int argc, char *argv[])
if (fflag && argc == 1) {
tmp = NULL;
tmpsize = 0;
for(;;) {
for (;;) {
while (getline(&tmp, &tmpsize, fp) != -1) {
fputs(tmp, stdout);
fflush(stdout);

2
uuencode.c
View File

@ -44,7 +44,7 @@ uuencodeb64(FILE *fp, const char *name, const char *s)
if (m != 0) {
unsigned int mask = 0xffffffff, dest = 0x3d3d3d3d;
/* m==2 -> 0x00ffffff; m==1 -> 0x0000ffff */
mask >>= ((3-m) << 3);
mask >>= ((3-m) << 3);
po[-1] = (po[-1] & mask) | (dest & ~mask);
}
*po++ = '\n';