From 749384a154025e268b53cf3cc79eaeddde2b3ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 27 Jun 2017 13:56:16 +0200 Subject: initial stretch branch release 2.4.0-6 --- src/openvpn/manage.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/openvpn/manage.c') diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index c2e8dc7..763f6c6 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -16,9 +16,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * You should have received a copy of the GNU General Public License + * along with this program (see the file COPYING included with this + * distribution); if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H @@ -1983,9 +1984,7 @@ man_process_command(struct management *man, const char *line) { int i; for (i = 0; i < nparms; ++i) - { msg(M_INFO, "[%d] '%s'", i, parms[i]); - } } #endif @@ -3089,8 +3088,7 @@ management_io(struct management *man) if (net_events & FD_READ) { while (man_read(man) > 0) - { - } + ; net_event_win32_clear_selected_events(&man->connection.ne32, FD_READ); } @@ -3313,8 +3311,7 @@ man_wait_for_client_connection(struct management *man, { msg(D_MANAGEMENT, "Need information from management interface, waiting..."); } - do - { + do { man_standalone_event_loop(man, signal_received, expire); if (signal_received && *signal_received) { @@ -3932,9 +3929,7 @@ log_history_free_contents(struct log_history *h) { int i; for (i = 0; i < h->size; ++i) - { log_entry_free_contents(&h->array[log_index(h, i)]); - } free(h->array); } @@ -3978,9 +3973,7 @@ log_history_resize(struct log_history *h, const int capacity) log_history_obj_init(&newlog, capacity); for (i = 0; i < h->size; ++i) - { log_history_add(&newlog, &h->array[log_index(h, i)]); - } log_history_free_contents(h); *h = newlog; @@ -4002,7 +3995,6 @@ log_history_ref(const struct log_history *h, const int index) #else /* ifdef ENABLE_MANAGEMENT */ static void -dummy(void) -{ +dummy(void) { } #endif /* ENABLE_MANAGEMENT */ -- cgit v1.2.3