From: Arran Cudbard-Bell Date: Tue, 30 Dec 2014 17:05:27 +0000 (-0500) Subject: Formatting X-Git-Tag: release_3_0_7~395 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db01d2d4fe239c3064d0f9c0b397fb7409f46f8b;p=thirdparty%2Ffreeradius-server.git Formatting --- diff --git a/src/main/conffile.c b/src/main/conffile.c index c498d9f926c..321166c1ba0 100644 --- a/src/main/conffile.c +++ b/src/main/conffile.c @@ -2932,10 +2932,9 @@ CONF_ITEM *cf_item_find_next(CONF_SECTION const *section, CONF_ITEM const *item) if (!section) return NULL; /* - * If item is NULL this must be a first time run - * Return the first item + * If item is NULL this must be a first time run + * Return the first item */ - if (item == NULL) { return section->children; } else { @@ -3038,9 +3037,7 @@ static CONF_DATA *cf_data_alloc(CONF_SECTION *parent, char const *name, return cd; } - -static void *cf_data_find_internal(CONF_SECTION const *cs, char const *name, - int flag) +static void *cf_data_find_internal(CONF_SECTION const *cs, char const *name, int flag) { if (!cs || !name) return NULL; diff --git a/src/main/process.c b/src/main/process.c index 449254572d0..fb5461498c3 100644 --- a/src/main/process.c +++ b/src/main/process.c @@ -1148,7 +1148,7 @@ STATE_MACHINE_DECL(request_common) #ifdef WITH_PROXY case FR_ACTION_PROXY_REPLY: RDEBUG2("Reply from home server %s port %d - ID: %d arrived too late. Try increasing 'retry_delay' or 'max_request_time'", - inet_ntop(request->proxy->dst_ipaddr.af, + inet_ntop(request->proxy->dst_ipaddr.af, &request->proxy->dst_ipaddr.ipaddr, buffer, sizeof(buffer)), request->proxy->dst_port, request->proxy->id); diff --git a/src/main/realms.c b/src/main/realms.c index fbcbce18328..b661b28bdb0 100644 --- a/src/main/realms.c +++ b/src/main/realms.c @@ -849,12 +849,10 @@ static home_pool_t *server_pool_alloc(char const *name, home_pool_type_t type, { home_pool_t *pool; - pool = rad_malloc(sizeof(*pool) + (sizeof(pool->servers[0]) * - num_home_servers)); + pool = rad_malloc(sizeof(*pool) + (sizeof(pool->servers[0]) * num_home_servers)); if (!pool) return NULL; /* just for pairanoia */ - memset(pool, 0, sizeof(*pool) + (sizeof(pool->servers[0]) * - num_home_servers)); + memset(pool, 0, sizeof(*pool) + (sizeof(pool->servers[0]) * num_home_servers)); pool->name = name; pool->type = type; @@ -1144,10 +1142,8 @@ static int server_pool_add(realm_config_t *rc, cf_log_info(cs, "\tvirtual_server = %s", pool->virtual_server); } - if (!cf_section_sub_find_name2(rc->cs, "server", - pool->virtual_server)) { - cf_log_err_cp(cp, "No such server %s", - pool->virtual_server); + if (!cf_section_sub_find_name2(rc->cs, "server", pool->virtual_server)) { + cf_log_err_cp(cp, "No such server %s", pool->virtual_server); goto error; }