summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-02-16 08:28:21 +0200
committerGordon Ross <gwr@nexenta.com>2017-06-11 12:31:06 -0400
commit15a0c3a7ba78a992f7bad7c25b74c4a6b91b7ff4 (patch)
tree7d7b5718441843d95e34f48a08e755ff50631f08
parent5b0d4055542d02d79e8b2cd0079f0580027f87e4 (diff)
downloadillumos-joyent-15a0c3a7ba78a992f7bad7c25b74c4a6b91b7ff4.tar.gz
8320 regcmp: misleading-indentation
Reviewed by: Igor Kozhukhov <igor@dilos.org> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r--usr/src/cmd/regcmp/regcmp.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/usr/src/cmd/regcmp/regcmp.c b/usr/src/cmd/regcmp/regcmp.c
index edba830e73..375d1c1f5d 100644
--- a/usr/src/cmd/regcmp/regcmp.c
+++ b/usr/src/cmd/regcmp/regcmp.c
@@ -27,8 +27,6 @@
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <stdio.h>
#include <locale.h>
#include <libgen.h>
@@ -83,11 +81,13 @@ main(int argc, char **argv)
cp = ofile;
while (*++bp)
if (*bp == '/') *bp = '\0';
- while (*--bp == '\0');
+ while (*--bp == '\0')
+ ;
while (*bp != '\0' && bp > *argv) bp--;
while (*bp == 0)
bp++;
- while (*cp++ = *bp++);
+ while (*cp++ = *bp++)
+ ;
cp--; *cp++ = '.';
if (cflg) *cp++ = 'c';
else *cp++ = 'i';
@@ -104,15 +104,18 @@ main(int argc, char **argv)
name = a2;
if (!gotflg)
while (((c = getc(iobuf)) == '\n') ||
- (c == ' '));
+ (c == ' '))
+ ;
else
gotflg = 0;
if (c == EOF) break;
*name++ = c;
while (((*name++ = c = getc(iobuf)) != ' ') &&
- (c != EOF) && (c != '\n'));
- *--name = '\0';
- while (((c = getc(iobuf)) == ' ') || (c == '\n'));
+ (c != EOF) && (c != '\n'))
+ ;
+ *--name = '\0';
+ while (((c = getc(iobuf)) == ' ') || (c == '\n'))
+ ;
if (c != '"') {
if (c == EOF) {
message = gettext("unexpected eof\n");
@@ -125,7 +128,8 @@ main(int argc, char **argv)
message =
gettext(" : remainder of line ignored\n");
write(2, message, strlen(message));
- while ((c = getc(iobuf)) != '\n');
+ while ((c = getc(iobuf)) != '\n')
+ ;
continue;
}
keeponl:
@@ -167,7 +171,8 @@ main(int argc, char **argv)
write(2, message, strlen(message));
exit(1);
}
- while (((c = getc(iobuf)) == '\n') || (c == ' '));
+ while (((c = getc(iobuf)) == '\n') || (c == ' '))
+ ;
if (c == '"') goto keeponl;
else {
gotflg++;