summaryrefslogtreecommitdiff
path: root/fitz
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2009-11-29 16:54:23 +0100
committerTor Andersson <tor@ghostscript.com>2009-11-29 16:54:23 +0100
commit12ddfc8eca5323feb758a7966ca51a3b52279316 (patch)
tree25f6e8a18625c0874b350b915f2ce5c0d738b7f3 /fitz
parent12f9f21bbcb99a397d06ceff6d83bbc94397580e (diff)
downloadmupdf-12ddfc8eca5323feb758a7966ca51a3b52279316.tar.xz
Add some braces and fix up double-indentation on multi-line if/while expressions.
Diffstat (limited to 'fitz')
-rw-r--r--fitz/base_hash.c4
-rw-r--r--fitz/filt_predict.c6
-rw-r--r--fitz/obj_print.c2
-rw-r--r--fitz/util_getopt.c9
4 files changed, 9 insertions, 12 deletions
diff --git a/fitz/base_hash.c b/fitz/base_hash.c
index 927cc104..cd866041 100644
--- a/fitz/base_hash.c
+++ b/fitz/base_hash.c
@@ -203,8 +203,8 @@ fz_hashremove(fz_hashtable *table, void *key)
{
code = hash(ents[look].key, table->keylen) % size;
if ((code <= hole && hole < look) ||
- (look < code && code <= hole) ||
- (hole < look && look < code))
+ (look < code && code <= hole) ||
+ (hole < look && look < code))
{
ents[hole] = ents[look];
ents[look].val = nil;
diff --git a/fitz/filt_predict.c b/fitz/filt_predict.c
index a3067bdb..a9958c63 100644
--- a/fitz/filt_predict.c
+++ b/fitz/filt_predict.c
@@ -38,9 +38,9 @@ fz_newpredictd(fz_obj *params)
p->predictor = fz_toint(obj);
if (p->predictor != 1 && p->predictor != 2 &&
- p->predictor != 10 && p->predictor != 11 &&
- p->predictor != 12 && p->predictor != 13 &&
- p->predictor != 14 && p->predictor != 15)
+ p->predictor != 10 && p->predictor != 11 &&
+ p->predictor != 12 && p->predictor != 13 &&
+ p->predictor != 14 && p->predictor != 15)
{
fz_warn("invalid predictor: %d", p->predictor);
p->predictor = 1;
diff --git a/fitz/obj_print.c b/fitz/obj_print.c
index a26f8f3d..1c2cd62d 100644
--- a/fitz/obj_print.c
+++ b/fitz/obj_print.c
@@ -139,7 +139,7 @@ static void fmtname(struct fmt *fmt, fz_obj *obj)
for (i = 0; s[i]; i++)
{
if (isdelim(s[i]) || iswhite(s[i]) ||
- s[i] == '#' || s[i] < 32 || s[i] > 127)
+ s[i] == '#' || s[i] < 32 || s[i] > 127)
{
fmtputc(fmt, '#');
c = (s[i] >> 4) & 0xf;
diff --git a/fitz/util_getopt.c b/fitz/util_getopt.c
index 22ac8148..b2cf1b71 100644
--- a/fitz/util_getopt.c
+++ b/fitz/util_getopt.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)getopt.c 4.13 (Berkeley) 2/23/91";
/*
* get option letter from argument vector
*/
-int opterr = 1, /* if error message should be printed */
+int opterr = 1, /* if error message should be printed */
optind = 1, /* index into parent argv vector */
optopt; /* character checked for validity */
char *optarg; /* argument associated with option */
@@ -87,8 +87,7 @@ int fz_getopt(int nargc, char * const * nargv, const char *ostr)
p = *nargv;
else
++p;
- (void)fprintf(stderr, "%s: illegal option -- %c\n",
- p, optopt);
+ (void)fprintf(stderr, "%s: illegal option -- %c\n", p, optopt);
}
return(BADCH);
}
@@ -107,9 +106,7 @@ int fz_getopt(int nargc, char * const * nargv, const char *ostr)
else
++p;
if (opterr)
- (void)fprintf(stderr,
- "%s: option requires an argument -- %c\n",
- p, optopt);
+ (void)fprintf(stderr, "%s: option requires an argument -- %c\n", p, optopt);
return(BADCH);
}
else /* white space */