code style: remove space after unary "not" operator

There are no semantic changes in this commit.

Suggested-by: Mike Frysinger <vapier@gentoo.org>
See: https://github.com/OpenRC/openrc/pull/435#pullrequestreview-727035394
This commit is contained in:
Matt Whitlock 2021-08-16 23:21:33 -04:00 committed by Mike Frysinger
parent 703bdbf88e
commit 8ffc4162e2
19 changed files with 42 additions and 42 deletions

View File

@ -38,7 +38,7 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#ifdef __GLIBC__ #ifdef __GLIBC__
# if ! defined (__UCLIBC__) && ! defined (__dietlibc__) # if !defined (__UCLIBC__) && !defined (__dietlibc__)
# define strlcpy(dst, src, size) snprintf(dst, size, "%s", src) # define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
# endif # endif
#endif #endif
@ -85,7 +85,7 @@ _unused static char *xstrdup(const char *str)
{ {
char *value; char *value;
if (! str) if (!str)
return (NULL); return (NULL);
value = strdup(str); value = strdup(str);

View File

@ -152,7 +152,7 @@ static const char *const color_terms[] = {
/* strlcat and strlcpy are nice, shame glibc does not define them */ /* strlcat and strlcpy are nice, shame glibc does not define them */
#ifdef __GLIBC__ #ifdef __GLIBC__
# if ! defined (__UCLIBC__) && ! defined (__dietlibc__) # if !defined (__UCLIBC__) && !defined (__dietlibc__)
static size_t static size_t
strlcat(char *dst, const char *src, size_t size) strlcat(char *dst, const char *src, size_t size)
{ {

View File

@ -129,7 +129,7 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
if (exists("/proc/self/status")) { if (exists("/proc/self/status")) {
fp = fopen("/proc/self/status", "r"); fp = fopen("/proc/self/status", "r");
if (fp) { if (fp) {
while (! feof(fp)) { while (!feof(fp)) {
rc_getline(&line, &len, fp); rc_getline(&line, &len, fp);
if (strncmp(line, "envID:\t0", 8) == 0) { if (strncmp(line, "envID:\t0", 8) == 0) {
openvz_host = true; openvz_host = true;
@ -183,12 +183,12 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
if (exists(buffer)) { if (exists(buffer)) {
fp = fopen(buffer, "r"); fp = fopen(buffer, "r");
free(buffer); free(buffer);
if (! fp) if (!fp)
continue; continue;
while (! feof(fp)) { while (!feof(fp)) {
rc_getline(&line, &len, fp); rc_getline(&line, &len, fp);
if (strncmp(line, "envID:", 6) == 0) { if (strncmp(line, "envID:", 6) == 0) {
container_pid = ! (strncmp(line, "envID:\t0", 8) == 0); container_pid = !(strncmp(line, "envID:\t0", 8) == 0);
break; break;
} }
} }

View File

@ -32,7 +32,7 @@ get_shell_value(char *string)
char *p = string; char *p = string;
char *e; char *e;
if (! string) if (!string)
return NULL; return NULL;
if (*p == '\'') if (*p == '\'')
@ -142,7 +142,7 @@ rc_deptree_load_file(const char *deptree_file)
if (strcmp(type, "service") == 0) { if (strcmp(type, "service") == 0) {
/* Sanity */ /* Sanity */
e = get_shell_value(p); e = get_shell_value(p);
if (! e || *e == '\0') if (!e || *e == '\0')
continue; continue;
depinfo = xmalloc(sizeof(*depinfo)); depinfo = xmalloc(sizeof(*depinfo));
TAILQ_INIT(&depinfo->depends); TAILQ_INIT(&depinfo->depends);
@ -493,7 +493,7 @@ rc_deptree_order(const RC_DEPTREE *deptree, const char *runlevel, int options)
RC_STRINGLIST *services; RC_STRINGLIST *services;
bootlevel = getenv("RC_BOOTLEVEL"); bootlevel = getenv("RC_BOOTLEVEL");
if (! bootlevel) if (!bootlevel)
bootlevel = RC_LEVEL_BOOT; bootlevel = RC_LEVEL_BOOT;
/* When shutting down, list all running services */ /* When shutting down, list all running services */

View File

@ -210,11 +210,11 @@ static void rc_config_set_value(RC_STRINGLIST *config, char *value)
bool replaced; bool replaced;
char *token; char *token;
if (! p) if (!p)
return; return;
if (strncmp(p, "export ", 7) == 0) if (strncmp(p, "export ", 7) == 0)
p += 7; p += 7;
if (! (token = strsep(&p, "="))) if (!(token = strsep(&p, "=")))
return; return;
entry = xstrdup(token); entry = xstrdup(token);
@ -338,7 +338,7 @@ static RC_STRINGLIST * rc_config_directory(RC_STRINGLIST *config)
if (rc_conf_d_files) { if (rc_conf_d_files) {
rc_stringlist_sort(&rc_conf_d_files); rc_stringlist_sort(&rc_conf_d_files);
TAILQ_FOREACH(fname, rc_conf_d_files, entries) { TAILQ_FOREACH(fname, rc_conf_d_files, entries) {
if (! fname->value) if (!fname->value)
continue; continue;
sprintf(path, "%s/%s", RC_CONF_D, fname->value); sprintf(path, "%s/%s", RC_CONF_D, fname->value);
rc_conf_d_list = rc_config_list(path); rc_conf_d_list = rc_config_list(path);
@ -405,7 +405,7 @@ rc_conf_value(const char *setting)
RC_STRING *s; RC_STRING *s;
char *p; char *p;
if (! rc_conf) { if (!rc_conf) {
rc_conf = rc_config_load(RC_CONF); rc_conf = rc_config_load(RC_CONF);
atexit(_free_rc_conf); atexit(_free_rc_conf);

View File

@ -538,10 +538,10 @@ rc_service_resolve(const char *service)
/* First check started services */ /* First check started services */
snprintf(file, sizeof(file), RC_SVCDIR "/%s/%s", "started", service); snprintf(file, sizeof(file), RC_SVCDIR "/%s/%s", "started", service);
if (lstat(file, &buf) || ! S_ISLNK(buf.st_mode)) { if (lstat(file, &buf) || !S_ISLNK(buf.st_mode)) {
snprintf(file, sizeof(file), RC_SVCDIR "/%s/%s", snprintf(file, sizeof(file), RC_SVCDIR "/%s/%s",
"inactive", service); "inactive", service);
if (lstat(file, &buf) || ! S_ISLNK(buf.st_mode)) if (lstat(file, &buf) || !S_ISLNK(buf.st_mode))
*file = '\0'; *file = '\0';
} }
@ -742,7 +742,7 @@ rc_service_mark(const char *service, const RC_SERVICE state)
s != RC_SERVICE_STOPPED && s != RC_SERVICE_STOPPED &&
s != RC_SERVICE_HOTPLUGGED && s != RC_SERVICE_HOTPLUGGED &&
s != RC_SERVICE_SCHEDULED) && s != RC_SERVICE_SCHEDULED) &&
(! skip_wasinactive || s != RC_SERVICE_WASINACTIVE)) (!skip_wasinactive || s != RC_SERVICE_WASINACTIVE))
{ {
snprintf(file, sizeof(file), RC_SVCDIR "/%s/%s", snprintf(file, sizeof(file), RC_SVCDIR "/%s/%s",
rc_service_state_names[i].name, base); rc_service_state_names[i].name, base);
@ -901,7 +901,7 @@ rc_service_schedule_start(const char *service, const char *service_to_start)
bool retval; bool retval;
/* service may be a provided service, like net */ /* service may be a provided service, like net */
if (! service || ! rc_service_exists(service_to_start)) if (!service || !rc_service_exists(service_to_start))
return false; return false;
p += snprintf(file, sizeof(file), RC_SVCDIR "/scheduled/%s", p += snprintf(file, sizeof(file), RC_SVCDIR "/scheduled/%s",
@ -1000,7 +1000,7 @@ rc_services_in_state(RC_SERVICE state)
dirs = ls_dir(dir, 0); dirs = ls_dir(dir, 0);
list = rc_stringlist_new(); list = rc_stringlist_new();
if (! dirs) if (!dirs)
return list; return list;
TAILQ_FOREACH(d, dirs, entries) { TAILQ_FOREACH(d, dirs, entries) {

View File

@ -43,7 +43,7 @@ static int syslog_decode(char *name, const CODE *codetab)
return atoi(name); return atoi(name);
for (c = codetab; c->c_name; c++) for (c = codetab; c->c_name; c++)
if (! strcasecmp(name, c->c_name)) if (!strcasecmp(name, c->c_name))
return c->c_val; return c->c_val;
return -1; return -1;

View File

@ -43,7 +43,7 @@ int main(int argc, char **argv)
if (service == NULL) if (service == NULL)
eerrorx("%s: no service specified", applet); eerrorx("%s: no service specified", applet);
if (argc < 2 || ! argv[1] || *argv[1] == '\0') if (argc < 2 || !argv[1] || *argv[1] == '\0')
eerrorx("%s: no option specified", applet); eerrorx("%s: no option specified", applet);
if (strcmp(applet, "service_get_value") == 0 || if (strcmp(applet, "service_get_value") == 0 ||

View File

@ -78,7 +78,7 @@ static int mount_proc(void)
syslog(LOG_ERR, "mount returned non-zero exit status"); syslog(LOG_ERR, "mount returned non-zero exit status");
break; break;
} }
if (! exists("/proc/version")) { if (!exists("/proc/version")) {
syslog(LOG_ERR, "Could not mount /proc"); syslog(LOG_ERR, "Could not mount /proc");
return -1; return -1;
} }
@ -113,7 +113,7 @@ static bool is_user_process(pid_t pid)
continue; continue;
} }
temp_pid = -1; temp_pid = -1;
while (! feof(fp)) { while (!feof(fp)) {
buf = NULL; buf = NULL;
if (getline(&buf, &size, fp) != -1) { if (getline(&buf, &size, fp) != -1) {
sscanf(buf, "PPid: %d", &temp_pid); sscanf(buf, "PPid: %d", &temp_pid);

View File

@ -161,7 +161,7 @@ process_mount(RC_STRINGLIST *list, struct args *args,
TAILQ_FOREACH(s, args->mounts, entries) TAILQ_FOREACH(s, args->mounts, entries)
if (strcmp(s->value, to) == 0) if (strcmp(s->value, to) == 0)
break; break;
if (! s) if (!s)
return -1; return -1;
} }
@ -260,7 +260,7 @@ find_mounts(struct args *args)
if (flags & o->o_opt) { if (flags & o->o_opt) {
if (o->o_opt == MNT_LOCAL) if (o->o_opt == MNT_LOCAL)
netdev = 1; netdev = 1;
if (! options) if (!options)
options = xstrdup(o->o_name); options = xstrdup(o->o_name);
else { else {
xasprintf(&tmp, "%s,%s", options, o->o_name); xasprintf(&tmp, "%s,%s", options, o->o_name);
@ -475,7 +475,7 @@ int main(int argc, char **argv)
if (skip_point_regex && if (skip_point_regex &&
regexec(skip_point_regex, s->value, 0, NULL, 0) == 0) regexec(skip_point_regex, s->value, 0, NULL, 0) == 0)
continue; continue;
if (! rc_yesno(getenv("EINFO_QUIET"))) if (!rc_yesno(getenv("EINFO_QUIET")))
printf("%s\n", s->value); printf("%s\n", s->value);
result = EXIT_SUCCESS; result = EXIT_SUCCESS;
} }

View File

@ -295,7 +295,7 @@ int main(int argc, char **argv)
/* set default path */ /* set default path */
setenv("PATH", path_default, 1); setenv("PATH", path_default, 1);
if (! reexec) if (!reexec)
init(default_runlevel); init(default_runlevel);
if (mkfifo(RC_INIT_FIFO, 0600) == -1 && errno != EEXIST) if (mkfifo(RC_INIT_FIFO, 0600) == -1 && errno != EEXIST)

View File

@ -94,7 +94,7 @@ write_log(int logfd, const char *buffer, size_t bytes)
continue; continue;
} }
if (! in_term || isalpha((unsigned char)*p)) if (!in_term || isalpha((unsigned char)*p))
in_escape = in_term = false; in_escape = in_term = false;
cont: cont:
p++; p++;

View File

@ -138,7 +138,7 @@ env_config(void)
/* Ensure our PATH is prefixed with the system locations first /* Ensure our PATH is prefixed with the system locations first
for a little extra security */ for a little extra security */
path = getenv("PATH"); path = getenv("PATH");
if (! path) if (!path)
setenv("PATH", RC_PATH_PREFIX, 1); setenv("PATH", RC_PATH_PREFIX, 1);
else if (strncmp (RC_PATH_PREFIX, path, pplen) != 0) { else if (strncmp (RC_PATH_PREFIX, path, pplen) != 0) {
l = strlen(path) + pplen + 3; l = strlen(path) + pplen + 3;
@ -152,7 +152,7 @@ env_config(void)
while ((tok = strsep(&npp, ":"))) while ((tok = strsep(&npp, ":")))
if (strcmp(tok, token) == 0) if (strcmp(tok, token) == 0)
break; break;
if (! tok) if (!tok)
p += snprintf(p, l - (p - e), ":%s", token); p += snprintf(p, l - (p - e), ":%s", token);
free (np); free (np);
} }
@ -203,7 +203,7 @@ env_config(void)
setenv("EINFO_VERBOSE", "YES", 1); setenv("EINFO_VERBOSE", "YES", 1);
errno = 0; errno = 0;
if ((! rc_conf_yesno("rc_color") && errno == 0) || if ((!rc_conf_yesno("rc_color") && errno == 0) ||
rc_conf_yesno("rc_nocolor")) rc_conf_yesno("rc_nocolor"))
setenv("EINFO_COLOR", "NO", 1); setenv("EINFO_COLOR", "NO", 1);
} }
@ -472,7 +472,7 @@ pid_t get_pid(const char *applet,const char *pidfile)
FILE *fp; FILE *fp;
pid_t pid; pid_t pid;
if (! pidfile) if (!pidfile)
return -1; return -1;
if ((fp = fopen(pidfile, "r")) == NULL) { if ((fp = fopen(pidfile, "r")) == NULL) {

View File

@ -279,7 +279,7 @@ int do_stop(const char *applet, const char *exec, const char *const *argv,
errno = 0; errno = 0;
killed = (kill(pi->pid, sig) == 0 || killed = (kill(pi->pid, sig) == 0 ||
errno == ESRCH ? true : false); errno == ESRCH ? true : false);
if (! quiet) if (!quiet)
eendv(killed ? 0 : 1, eendv(killed ? 0 : 1,
"%s: failed to send signal %d to PID %d: %s", "%s: failed to send signal %d to PID %d: %s",
applet, sig, pi->pid, strerror(errno)); applet, sig, pi->pid, strerror(errno));
@ -422,7 +422,7 @@ int run_stop_schedule(const char *applet,
if (progressed) if (progressed)
printf("\n"); printf("\n");
if (! quiet) { if (!quiet) {
if (nrunning == 1) if (nrunning == 1)
eerror("%s: %d process refused to stop", applet, nrunning); eerror("%s: %d process refused to stop", applet, nrunning);
else else

View File

@ -154,15 +154,15 @@ int main(int argc, char **argv)
eerrorx("%s: service `%s' does not exist", applet, *argv); eerrorx("%s: service `%s' does not exist", applet, *argv);
} }
state = rc_service_state(*argv); state = rc_service_state(*argv);
if (if_crashed && ! (rc_service_daemons_crashed(*argv) && errno != EACCES)) if (if_crashed && !(rc_service_daemons_crashed(*argv) && errno != EACCES))
return 0; return 0;
if (if_inactive && ! (state & RC_SERVICE_INACTIVE)) if (if_inactive && !(state & RC_SERVICE_INACTIVE))
return 0; return 0;
if (if_notstarted && (state & RC_SERVICE_STARTED)) if (if_notstarted && (state & RC_SERVICE_STARTED))
return 0; return 0;
if (if_started && ! (state & RC_SERVICE_STARTED)) if (if_started && !(state & RC_SERVICE_STARTED))
return 0; return 0;
if (if_stopped && ! (state & RC_SERVICE_STOPPED)) if (if_stopped && !(state & RC_SERVICE_STOPPED))
return 0; return 0;
*argv = service; *argv = service;
execv(*argv, argv); execv(*argv, argv);

View File

@ -412,7 +412,7 @@ int main(int argc, char **argv)
state = rc_service_state(s->value); state = rc_service_state(s->value);
if ((rc_stringlist_find(sservices, s->value) || if ((rc_stringlist_find(sservices, s->value) ||
(state & ( RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)))) { (state & ( RC_SERVICE_STOPPED | RC_SERVICE_HOTPLUGGED)))) {
if (! (state & RC_SERVICE_FAILED)) { if (!(state & RC_SERVICE_FAILED)) {
TAILQ_REMOVE(services, s, entries); TAILQ_REMOVE(services, s, entries);
free(s->value); free(s->value);
free(s); free(s);

View File

@ -31,7 +31,7 @@ int main(int argc, char **argv)
putchar(' '); putchar(' ');
while (*p) { while (*p) {
c = (unsigned char)*p++; c = (unsigned char)*p++;
if (! isalnum(c)) if (!isalnum(c))
c = '_'; c = '_';
putchar(c); putchar(c);
} }

View File

@ -800,7 +800,7 @@ int main(int argc, char **argv)
if (makepidfile && pidfile) { if (makepidfile && pidfile) {
fp = fopen(pidfile, "w"); fp = fopen(pidfile, "w");
if (! fp) if (!fp)
eerrorx("%s: fopen `%s': %s", applet, pidfile, eerrorx("%s: fopen `%s': %s", applet, pidfile,
strerror(errno)); strerror(errno));
fprintf(fp, "%d\n", mypid); fprintf(fp, "%d\n", mypid);

View File

@ -1037,7 +1037,7 @@ int main(int argc, char **argv)
/* Make sure we can write a pid file */ /* Make sure we can write a pid file */
fp = fopen(pidfile, "w"); fp = fopen(pidfile, "w");
if (! fp) if (!fp)
eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno)); eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
fclose(fp); fclose(fp);