]>
Commit | Line | Data |
---|---|---|
c6ce1e7e MT |
1 | From 7aa970e2c7043201663d86a4b5d8cd5c592cef39 Mon Sep 17 00:00:00 2001 |
2 | From: Stefan Tomanek <stefan.tomanek+dnsmasq@wertarbyte.de> | |
3 | Date: Wed, 1 Apr 2015 17:55:07 +0100 | |
efbd3a9a | 4 | Subject: [PATCH 69/98] Whitespace fixes. |
c6ce1e7e MT |
5 | |
6 | --- | |
7 | src/dnsmasq.c | 14 +++++++------- | |
8 | src/tftp.c | 2 +- | |
9 | 2 files changed, 8 insertions(+), 8 deletions(-) | |
10 | ||
11 | diff --git a/src/dnsmasq.c b/src/dnsmasq.c | |
12 | index 0d4d4558a2e2..a7c5da8fbd01 100644 | |
13 | --- a/src/dnsmasq.c | |
14 | +++ b/src/dnsmasq.c | |
15 | @@ -345,7 +345,7 @@ int main (int argc, char **argv) | |
16 | #else | |
17 | die(_("DBus not available: set HAVE_DBUS in src/config.h"), NULL, EC_BADCONF); | |
18 | #endif | |
19 | - | |
20 | + | |
21 | if (daemon->port != 0) | |
22 | pre_allocate_sfds(); | |
23 | ||
24 | @@ -657,7 +657,7 @@ int main (int argc, char **argv) | |
25 | } | |
26 | closedir(dir); | |
27 | } | |
28 | - | |
29 | + | |
30 | for (p = daemon->if_prefix; p; p = p->next) | |
31 | { | |
32 | p->missing = 0; | |
33 | @@ -669,12 +669,12 @@ int main (int argc, char **argv) | |
34 | send_event(err_pipe[1], EVENT_TFTP_ERR, errno, p->prefix); | |
35 | _exit(0); | |
36 | } | |
37 | - } | |
38 | + } | |
39 | closedir(dir); | |
40 | } | |
41 | } | |
42 | #endif | |
43 | - | |
44 | + | |
45 | if (daemon->port == 0) | |
46 | my_syslog(LOG_INFO, _("started, version %s DNS disabled"), VERSION); | |
47 | else if (daemon->cachesize != 0) | |
48 | @@ -784,7 +784,7 @@ int main (int argc, char **argv) | |
49 | ||
50 | #ifdef HAVE_TFTP | |
51 | if (option_bool(OPT_TFTP)) | |
52 | - { | |
53 | + { | |
54 | struct tftp_prefix *p; | |
55 | #ifdef FD_SETSIZE | |
56 | if (FD_SETSIZE < (unsigned)max_fd) | |
57 | @@ -795,10 +795,10 @@ int main (int argc, char **argv) | |
58 | daemon->tftp_prefix ? _("root is ") : _("enabled"), | |
59 | daemon->tftp_prefix ? daemon->tftp_prefix: "", | |
60 | option_bool(OPT_TFTP_SECURE) ? _("secure mode") : ""); | |
61 | - | |
62 | + | |
63 | if (tftp_prefix_missing) | |
64 | my_syslog(MS_TFTP | LOG_WARNING, _("warning: %s inaccessible"), daemon->tftp_prefix); | |
65 | - | |
66 | + | |
67 | for (p = daemon->if_prefix; p; p = p->next) | |
68 | if (p->missing) | |
69 | my_syslog(MS_TFTP | LOG_WARNING, _("warning: TFTP directory %s inaccessible"), p->prefix); | |
70 | diff --git a/src/tftp.c b/src/tftp.c | |
71 | index a57a31514f44..d3fb6d7492e4 100644 | |
72 | --- a/src/tftp.c | |
73 | +++ b/src/tftp.c | |
74 | @@ -236,7 +236,7 @@ void tftp_request(struct listener *listen, time_t now) | |
75 | if (ioctl(listen->tftpfd, SIOCGIFMTU, &ifr) != -1) | |
76 | mtu = ifr.ifr_mtu; | |
77 | } | |
78 | - | |
79 | + | |
80 | if (name) | |
81 | { | |
82 | /* check for per-interface prefix */ | |
83 | -- | |
84 | 2.1.0 | |
85 |