From a97605e07ad7f44f2f65e15be64880e61a39ab43 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 25 Jun 2010 01:08:29 +0200 Subject: from now on we enforce a strict whitespace regime --- avahi-utils/sigint.c | 18 +++++++++--------- avahi-utils/sigint.h | 6 +++--- avahi-utils/stdb.c | 26 +++++++++++++------------- avahi-utils/stdb.h | 6 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'avahi-utils') diff --git a/avahi-utils/sigint.c b/avahi-utils/sigint.c index eb97f38..448a069 100644 --- a/avahi-utils/sigint.c +++ b/avahi-utils/sigint.c @@ -2,17 +2,17 @@ /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -41,7 +41,7 @@ static AvahiWatch *watch = NULL; static int set_nonblock(int fd) { int n; - + assert(fd >= 0); if ((n = fcntl(fd, F_GETFL)) < 0) @@ -69,7 +69,7 @@ static void close_pipe_fds(void) { static void watch_callback(AvahiWatch *w, int fd, AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) { int s; ssize_t l; - + assert(w); assert(fd == pipe_fds[0]); assert(event == AVAHI_WATCH_IN); @@ -84,7 +84,7 @@ static void watch_callback(AvahiWatch *w, int fd, AvahiWatchEvent event, AVAHI_G int sigint_install(AvahiSimplePoll *spoll) { struct sigaction sa; const AvahiPoll *p; - + assert(spoll); assert(!simple_poll); assert(pipe_fds[0] == -1 && pipe_fds[1] == -1); @@ -106,7 +106,7 @@ int sigint_install(AvahiSimplePoll *spoll) { close_pipe_fds(); return -1; } - + if (sigaction(SIGTERM, &sa, &old_sigterm_sa) < 0) { sigaction(SIGINT, &old_sigint_sa, NULL); fprintf(stderr, "sigaction() failed: %s\n", strerror(errno)); @@ -117,13 +117,13 @@ int sigint_install(AvahiSimplePoll *spoll) { p = avahi_simple_poll_get(spoll); watch = p->watch_new(p, pipe_fds[0], AVAHI_WATCH_IN, watch_callback, NULL); assert(watch); - + simple_poll = spoll; return 0; } void sigint_uninstall(void) { - + if (!simple_poll) return; diff --git a/avahi-utils/sigint.h b/avahi-utils/sigint.h index 0bc5c34..4aef74f 100644 --- a/avahi-utils/sigint.h +++ b/avahi-utils/sigint.h @@ -5,17 +5,17 @@ /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 diff --git a/avahi-utils/stdb.c b/avahi-utils/stdb.c index b7a5ed3..759ecbd 100644 --- a/avahi-utils/stdb.c +++ b/avahi-utils/stdb.c @@ -2,17 +2,17 @@ /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -74,10 +74,10 @@ const char* stdb_lookup(const char *name) { data.dptr = NULL; data.dsize = 0; - + if ((loc = setlocale(LC_MESSAGES, NULL))) { char k[256]; - + snprintf(k, sizeof(k), "%s[%s]", name, loc); key.dptr = k; key.dsize = strlen(k); @@ -91,7 +91,7 @@ const char* stdb_lookup(const char *name) { if (!data.dptr) { char l[32], *e; snprintf(l, sizeof(l), "%s", loc); - + if ((e = strchr(l, '@'))) { *e = 0; snprintf(k, sizeof(k), "%s[%s]", name, l); @@ -139,9 +139,9 @@ const char* stdb_lookup(const char *name) { avahi_free(buffer); buffer = avahi_strndup(data.dptr, data.dsize); free(data.dptr); - + return buffer; - + fail: return name; @@ -169,12 +169,12 @@ void stdb_shutdown(void) { char *stdb_getent(void) { datum key; - + if (init() < 0) return NULL; for (;;) { - + if (!enum_key) { #ifdef HAVE_GDBM key = gdbm_firstkey(gdbm_file); @@ -185,7 +185,7 @@ char *stdb_getent(void) { } else { key.dptr = enum_key; key.dsize = strlen(enum_key); - + #ifdef HAVE_GDBM key = gdbm_nextkey(gdbm_file, key); #endif @@ -196,10 +196,10 @@ char *stdb_getent(void) { avahi_free(enum_key); enum_key = NULL; - + if (!key.dptr) return NULL; - + enum_key = avahi_strndup(key.dptr, key.dsize); free(key.dptr); diff --git a/avahi-utils/stdb.h b/avahi-utils/stdb.h index 3f8ccc0..7fab765 100644 --- a/avahi-utils/stdb.h +++ b/avahi-utils/stdb.h @@ -5,17 +5,17 @@ /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -- cgit