UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tipc: nuke the delimit static inline function. 

This "shortform" is actually longer than typing out what it is really
trying to do, and just makes reading the code more difficult, so
lets simply shoot it in the head.

In the case of log.c - the comparison is on a u32, so we can drop the
check for < 0 at the same time.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
Paul Gortmaker 2012-02-23 15:44:08 -05:00
parent f80c24d996
commit 732efba4d7
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/tipc/config.c
View File

@ -218,7 +218,7 @@ static struct sk_buff *cfg_set_max_publications(void)
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area)); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
if (value != delimit(value, 1, 65535)) if (value < 1 || value > 65535)
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max publications must be 1-65535)"); " (max publications must be 1-65535)");
tipc_max_publications = value; tipc_max_publications = value;
@ -233,7 +233,7 @@ static struct sk_buff *cfg_set_max_subscriptions(void)
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area)); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
if (value != delimit(value, 1, 65535)) if (value < 1 || value > 65535)
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max subscriptions must be 1-65535"); " (max subscriptions must be 1-65535");
tipc_max_subscriptions = value; tipc_max_subscriptions = value;
@ -249,7 +249,7 @@ static struct sk_buff *cfg_set_max_ports(void)
value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area)); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
if (value == tipc_max_ports) if (value == tipc_max_ports)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (value != delimit(value, 127, 65535)) if (value < 127 || value > 65535)
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max ports must be 127-65535)"); " (max ports must be 127-65535)");
if (tipc_mode != TIPC_NOT_RUNNING) if (tipc_mode != TIPC_NOT_RUNNING)
@ -268,7 +268,7 @@ static struct sk_buff *cfg_set_netid(void)
value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area)); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
if (value == tipc_net_id) if (value == tipc_net_id)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (value != delimit(value, 1, 9999)) if (value < 1 || value > 9999)
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (network id must be 1-9999)"); " (network id must be 1-9999)");
if (tipc_mode == TIPC_NET_MODE) if (tipc_mode == TIPC_NET_MODE)

10
net/tipc/core.h
View File

@ -168,16 +168,6 @@ extern void tipc_netlink_stop(void);
extern int tipc_socket_init(void); extern int tipc_socket_init(void);
extern void tipc_socket_stop(void); extern void tipc_socket_stop(void);
static inline int delimit(int val, int min, int max)
{
if (val > max)
return max;
if (val < min)
return min;
return val;
}
/* /*
* TIPC timer and signal code * TIPC timer and signal code
*/ */

2
net/tipc/log.c
View File

@ -304,7 +304,7 @@ struct sk_buff *tipc_log_resize_cmd(const void *req_tlv_area, int req_tlv_space)
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area)); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
if (value != delimit(value, 0, 32768)) if (value > 32768)
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (log size must be 0-32768)"); " (log size must be 0-32768)");
if (tipc_log_resize(value)) if (tipc_log_resize(value))