fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Un-boolify sbase

Browse Source 
It actually makes the binaries smaller, the code easier to read
(gems like "val == true", "val == false" are gone) and actually
predictable in the sense of that we actually know what we're
working with (one bitwise operator was quite adventurous and
should now be fixed).

This is also more consistent with the other suckless projects
around which don't use boolean types.
This commit is contained in:
FRIGN
2014-11-13 21:24:47 +01:00
committed by sin
parent 7d2683ddf2
commit ec8246bbc6
41 changed files with 215 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wc.c
View File

@@ -1,6 +1,5 @@
/* See LICENSE file for copyright and license details. */
#include <ctype.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -10,8 +9,8 @@
static void output(const char *, long, long, long);
static void wc(FILE *, const char *);
static bool lflag = false;
static bool wflag = false;
static int lflag = 0;
static int wflag = 0;
static char cmode = 0;
static long tc = 0, tl = 0, tw = 0;
@@ -35,10 +34,10 @@ main(int argc, char *argv[])
cmode = 'm';
break;
case 'l':
lflag = true;
lflag = 1;
break;
case 'w':
wflag = true;
wflag = 1;
break;
default:
usage();
@@ -64,7 +63,7 @@ main(int argc, char *argv[])
void
output(const char *str, long nc, long nl, long nw)
{
bool noflags = !cmode && !lflag && !wflag;
int noflags = !cmode && !lflag && !wflag;
if (lflag || noflags)
printf(" %5ld", nl);
@@ -80,7 +79,7 @@ output(const char *str, long nc, long nl, long nw)
void
wc(FILE *fp, const char *str)
{
bool word = false;
int word = 0;
int c;
long nc = 0, nl = 0, nw = 0;
@@ -90,9 +89,9 @@ wc(FILE *fp, const char *str)
if (c == '\n')
nl++;
if (!isspace(c))
word = true;
word = 1;
else if (word) {
word = false;
word = 0;
nw++;
}
}