From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QQLy1-0006CC-KI for garchives@archives.gentoo.org; Sat, 28 May 2011 16:02:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA5A81C095; Sat, 28 May 2011 16:02:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 970031C094 for ; Sat, 28 May 2011 16:02:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 246671B4011 for ; Sat, 28 May 2011 16:02:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 71A5880505 for ; Sat, 28 May 2011 16:02:12 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: src/librc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/librc/librc-daemon.c src/librc/librc-depend.c src/librc/librc-stringlist.c src/librc/librc.c X-VCS-Directories: src/librc/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: fe18c7bb632671457c3c261d36dece3fd09a4f69 Date: Sat, 28 May 2011 16:02:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e0c7c05ec37a9703f4ef7aee7eb0580b commit: fe18c7bb632671457c3c261d36dece3fd09a4f69 Author: Mike Frysinger gentoo org> AuthorDate: Sat May 28 15:53:29 2011 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat May 28 15:53:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Dfe18c7bb librc: tweak style: foo () -> foo() Signed-off-by: Mike Frysinger gentoo.org> --- src/librc/librc-daemon.c | 6 +++--- src/librc/librc-depend.c | 12 ++++++------ src/librc/librc-stringlist.c | 10 +++++----- src/librc/librc.c | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index dde62f9..c6b8782 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -308,10 +308,10 @@ _match_list(const char *exec, const char *const *ar= gv, const char *pidfile) =20 if (pidfile) { l =3D strlen(pidfile) + 9; - m =3D xmalloc(sizeof (char) * l); + m =3D xmalloc(sizeof(char) * l); snprintf(m, l, "pidfile=3D%s", pidfile); rc_stringlist_add(match, m); - free (m); + free(m); } =20 return match; @@ -508,7 +508,7 @@ rc_service_daemons_crashed(const char *service) if ((fp =3D fopen(pidfile, "r"))) { if (fscanf(fp, "%d", &pid) =3D=3D 1) retval =3D false; - fclose (fp); + fclose(fp); } free(pidfile); pidfile =3D NULL; diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index 2e39267..5d6167e 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -144,7 +144,7 @@ rc_deptree_load_file(const char *deptree_file) e =3D strsep(&p, "_"); if (!e || strcmp(e, "depinfo") !=3D 0) continue; - e =3D strsep (&p, "_"); + e =3D strsep(&p, "_"); if (!e || sscanf(e, "%d", &i) !=3D 1) continue; if (!(type =3D strsep(&p, "_=3D"))) @@ -425,8 +425,8 @@ visit_service(const RC_DEPTREE *deptree, continue; provided =3D get_provided(di, runlevel, options); TAILQ_FOREACH(p, provided, entries) - if (strcmp (p->value, depinfo->service) =3D=3D 0) { - visit_service (deptree, types, sorted, visited, di, + if (strcmp(p->value, depinfo->service) =3D=3D 0) { + visit_service(deptree, types, sorted, visited, di, runlevel, options | RC_DEP_TRACE); break; } @@ -681,7 +681,7 @@ rc_deptree_update_needed(time_t *newest, char *file) /* Create base directories if needed */ for (i =3D 0; depdirs[i]; i++) if (mkdir(depdirs[i], 0755) !=3D 0 && errno !=3D EEXIST) - fprintf(stderr, "mkdir `%s': %s\n", depdirs[i], strerror (errno)); + fprintf(stderr, "mkdir `%s': %s\n", depdirs[i], strerror(errno)); =20 /* Quick test to see if anything we use has changed and we have * data in our deptree */ @@ -922,7 +922,7 @@ rc_deptree_update(void) di =3D get_depinfo(deptree, s->value); if (!di) { if (strcmp(deptype->type, "ineed") =3D=3D 0) { - fprintf (stderr, + fprintf(stderr, "Service `%s' needs non" " existent service `%s'\n", depinfo->service, s->value); @@ -1032,7 +1032,7 @@ rc_deptree_update(void) if (TAILQ_FIRST(config)) { if ((fp =3D fopen(RC_DEPCONFIG, "w"))) { TAILQ_FOREACH(s, config, entries) - fprintf (fp, "%s\n", s->value); + fprintf(fp, "%s\n", s->value); fclose(fp); } else { fprintf(stderr, "fopen `%s': %s\n", diff --git a/src/librc/librc-stringlist.c b/src/librc/librc-stringlist.c index 818a31c..22b823b 100644 --- a/src/librc/librc-stringlist.c +++ b/src/librc/librc-stringlist.c @@ -41,7 +41,7 @@ rc_stringlist_new(void) librc_hidden_def(rc_stringlist_new) =20 RC_STRING * -rc_stringlist_add (RC_STRINGLIST *list, const char *value) +rc_stringlist_add(RC_STRINGLIST *list, const char *value) { RC_STRING *s =3D xmalloc(sizeof(*s)); =20 @@ -52,7 +52,7 @@ rc_stringlist_add (RC_STRINGLIST *list, const char *val= ue) librc_hidden_def(rc_stringlist_add) =20 RC_STRING * -rc_stringlist_addu (RC_STRINGLIST *list, const char *value) +rc_stringlist_addu(RC_STRINGLIST *list, const char *value) { RC_STRING *s; =20 @@ -74,8 +74,8 @@ rc_stringlist_delete(RC_STRINGLIST *list, const char *v= alue) TAILQ_FOREACH(s, list, entries) if (strcmp(s->value, value) =3D=3D 0) { TAILQ_REMOVE(list, s, entries); - free (s->value); - free (s); + free(s->value); + free(s); return true; } =20 @@ -127,7 +127,7 @@ rc_stringlist_sort(RC_STRINGLIST **list) TAILQ_REMOVE(l, s, entries); last =3D NULL; TAILQ_FOREACH(n, new, entries) { - if (strcmp (s->value, n->value) < 0) + if (strcmp(s->value, n->value) < 0) break; last =3D n; } diff --git a/src/librc/librc.c b/src/librc/librc.c index 5feb5d7..d769eea 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -749,7 +749,7 @@ rc_service_state(const char *service) =20 if (state & RC_SERVICE_STOPPED) { dirs =3D ls_dir(RC_SVCDIR "/scheduled", 0); - TAILQ_FOREACH (dir, dirs, entries) { + TAILQ_FOREACH(dir, dirs, entries) { snprintf(file, sizeof(file), RC_SVCDIR "/scheduled/%s/%s", dir->value, service); @@ -892,7 +892,7 @@ rc_services_in_runlevel_stacked(const char *runlevel) =20 list =3D rc_services_in_runlevel(runlevel); stacks =3D rc_runlevel_stacks(runlevel); - TAILQ_FOREACH (stack, stacks, entries) { + TAILQ_FOREACH(stack, stacks, entries) { sl =3D rc_services_in_runlevel(stack->value); if (list !=3D NULL) { TAILQ_CONCAT(list, sl, entries); @@ -1008,7 +1008,7 @@ rc_services_scheduled_by(const char *service) RC_STRING *dir; char file[PATH_MAX]; =20 - TAILQ_FOREACH (dir, dirs, entries) { + TAILQ_FOREACH(dir, dirs, entries) { snprintf(file, sizeof(file), RC_SVCDIR "/scheduled/%s/%s", dir->value, service); if (exists(file))