Skip to content

Commit

Permalink
[usb-moded] Normalize use of return statement
Browse files Browse the repository at this point in the history 
As 'return' is not a function, do not make it look like one.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
@spiiroin
spiiroin committed Sep 5, 2018
1 parent 94a484c commit 3161f17
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 90 deletions.
12 changes: 6 additions & 6 deletions src/usb_moded-appsync.c
View file
Expand Up @@ -258,7 +258,7 @@ int appsync_activate_sync(const char *mode)
#ifdef APP_SYNC_DBUS
appsync_enumerate_usb();
#endif
return(0);
return 0;
}

#ifdef APP_SYNC_DBUS
Expand Down Expand Up @@ -307,11 +307,11 @@ int appsync_activate_sync(const char *mode)
}
}

return(0);
return 0;

error:
log_warning("Error launching a service!\n");
return(1);
return 1;
}

int appsync_activate_sync_post(const char *mode)
Expand Down Expand Up @@ -365,11 +365,11 @@ int appsync_activate_sync_post(const char *mode)
}
}

return(0);
return 0;

error:
log_warning("Error launching a service!\n");
return(1);
return 1;
}

int appsync_mark_active(const gchar *name, int post)
Expand Down Expand Up @@ -511,5 +511,5 @@ int appsync_stop(gboolean force)
#ifdef APP_SYNC_DBUS
appsync_cancel_enumerate_usb_timer();
#endif
return(0);
return 0;
}
82 changes: 41 additions & 41 deletions src/usb_moded-config.c
View file
Expand Up @@ -113,12 +113,12 @@ static int config_validate_ip(const char *ipadd)
unsigned char c;

if (sscanf(ipadd, "%3u.%3u.%3u.%3u%c", &b1, &b2, &b3, &b4, &c) != 4)
return(-1);
return -1;

if ((b1 | b2 | b3 | b4) > 255)
return(-1);
return -1;
if (strspn(ipadd, "0123456789.") < strlen(ipadd))
return(-1);
return -1;
/* all ok */
return 0;
}
Expand All @@ -134,91 +134,91 @@ char *config_find_mounts(void)
ret = g_strdup(FS_MOUNT_DEFAULT);
log_debug("Default mount = %s\n", ret);
}
return(ret);
return ret;
}

int config_find_sync(void)
{

return(config_get_conf_int(FS_SYNC_ENTRY, FS_SYNC_KEY));
return config_get_conf_int(FS_SYNC_ENTRY, FS_SYNC_KEY);
}

char * config_find_alt_mount(void)
{
return(config_get_conf_string(ALT_MOUNT_ENTRY, ALT_MOUNT_KEY));
return config_get_conf_string(ALT_MOUNT_ENTRY, ALT_MOUNT_KEY);
}

char * config_find_udev_path(void)
{
return(config_get_conf_string(UDEV_PATH_ENTRY, UDEV_PATH_KEY));
return config_get_conf_string(UDEV_PATH_ENTRY, UDEV_PATH_KEY);
}

char * config_find_udev_subsystem(void)
{
return(config_get_conf_string(UDEV_PATH_ENTRY, UDEV_SUBSYSTEM_KEY));
return config_get_conf_string(UDEV_PATH_ENTRY, UDEV_SUBSYSTEM_KEY);
}

char * config_check_trigger(void)
{
return(config_get_conf_string(TRIGGER_ENTRY, TRIGGER_PATH_KEY));
return config_get_conf_string(TRIGGER_ENTRY, TRIGGER_PATH_KEY);
}

char * config_get_trigger_subsystem(void)
{
return(config_get_conf_string(TRIGGER_ENTRY, TRIGGER_UDEV_SUBSYSTEM));
return config_get_conf_string(TRIGGER_ENTRY, TRIGGER_UDEV_SUBSYSTEM);
}

char * config_get_trigger_mode(void)
{
return(config_get_conf_string(TRIGGER_ENTRY, TRIGGER_MODE_KEY));
return config_get_conf_string(TRIGGER_ENTRY, TRIGGER_MODE_KEY);
}

char * config_get_trigger_property(void)
{
return(config_get_conf_string(TRIGGER_ENTRY, TRIGGER_PROPERTY_KEY));
return config_get_conf_string(TRIGGER_ENTRY, TRIGGER_PROPERTY_KEY);
}

char * config_get_trigger_value(void)
{
return(config_get_conf_string(TRIGGER_ENTRY, TRIGGER_PROPERTY_VALUE_KEY));
return config_get_conf_string(TRIGGER_ENTRY, TRIGGER_PROPERTY_VALUE_KEY);
}

static char * config_get_network_ip(void)
{
char * ip = config_get_kcmdline_string(NETWORK_IP_KEY);
if (ip != NULL)
if(!config_validate_ip(ip))
return(ip);
return ip;

return(config_get_conf_string(NETWORK_ENTRY, NETWORK_IP_KEY));
return config_get_conf_string(NETWORK_ENTRY, NETWORK_IP_KEY);
}

static char * config_get_network_interface(void)
{
return(config_get_conf_string(NETWORK_ENTRY, NETWORK_INTERFACE_KEY));
return config_get_conf_string(NETWORK_ENTRY, NETWORK_INTERFACE_KEY);
}

static char * config_get_network_gateway(void)
{
char * gw = config_get_kcmdline_string(NETWORK_GATEWAY_KEY);
if (gw != NULL)
return(gw);
return gw;

return(config_get_conf_string(NETWORK_ENTRY, NETWORK_GATEWAY_KEY));
return config_get_conf_string(NETWORK_ENTRY, NETWORK_GATEWAY_KEY);
}

static char * config_get_network_netmask(void)
{
char * netmask = config_get_kcmdline_string(NETWORK_NETMASK_KEY);
if (netmask != NULL)
return(netmask);
return netmask;

return(config_get_conf_string(NETWORK_ENTRY, NETWORK_NETMASK_KEY));
return config_get_conf_string(NETWORK_ENTRY, NETWORK_NETMASK_KEY);
}

static char * config_get_network_nat_interface(void)
{
return(config_get_conf_string(NETWORK_ENTRY, NETWORK_NAT_INTERFACE_KEY));
return config_get_conf_string(NETWORK_ENTRY, NETWORK_NAT_INTERFACE_KEY);
}

/* create basic conffile with sensible defaults */
Expand Down Expand Up @@ -281,7 +281,7 @@ static int config_get_conf_int(const gchar *entry, const gchar *key)
}
g_strfreev(origkeys);
g_key_file_free(settingsfile);
return(ret);
return ret;

}

Expand Down Expand Up @@ -318,7 +318,7 @@ static char * config_get_conf_string(const gchar *entry, const gchar *key)
g_strfreev(origkeys);
end:
g_key_file_free(settingsfile);
return(tmp_char);
return tmp_char;

}

Expand All @@ -337,7 +337,7 @@ static char * config_get_kcmdline_string(const char *entry)
if ((fd = open("/proc/cmdline", O_RDONLY)) < 0)
{
log_debug("could not read /proc/cmdline");
return(ret);
return ret;
}

len = read(fd, cmdLine, sizeof cmdLine - 1);
Expand All @@ -346,7 +346,7 @@ static char * config_get_kcmdline_string(const char *entry)
if (len <= 0)
{
log_debug("kernel command line was empty");
return(ret);
return ret;
}

cmdLine[len] = '\0';
Expand All @@ -356,7 +356,7 @@ static char * config_get_kcmdline_string(const char *entry)
if (!g_shell_parse_argv(cmdLine, &argc, &argv, &optErr))
{
g_error_free(optErr);
return(ret);
return ret;
}

/* find the ip token */
Expand Down Expand Up @@ -395,7 +395,7 @@ static char * config_get_kcmdline_string(const char *entry)
g_strfreev(argv);
g_strfreev(network_tokens);

return(ret);
return ret;
}

char * config_get_mode_setting(void)
Expand Down Expand Up @@ -464,14 +464,14 @@ set_config_result_t config_set_config_setting(const char *entry, const char *key
ret = SET_CONFIG_UPDATED;
g_free(keyfile);

return (ret);
return ret;
}

set_config_result_t config_set_mode_setting(const char *mode)
{
if (strcmp(mode, MODE_ASK) && common_valid_mode(mode))
return SET_CONFIG_ERROR;
return (config_set_config_setting(MODE_SETTING_ENTRY, MODE_SETTING_KEY, mode));
return config_set_config_setting(MODE_SETTING_ENTRY, MODE_SETTING_KEY, mode);
}

/* Builds the string used for hidden modes, when hide set to one builds the
Expand Down Expand Up @@ -553,7 +553,7 @@ set_config_result_t config_set_hide_mode_setting(const char *mode)

g_free(hidden_modes);

return(ret);
return ret;
}

set_config_result_t config_set_unhide_mode_setting(const char *mode)
Expand All @@ -574,7 +574,7 @@ set_config_result_t config_set_unhide_mode_setting(const char *mode)

g_free(hidden_modes);

return(ret);
return ret;
}

set_config_result_t config_set_mode_whitelist(const char *whitelist)
Expand Down Expand Up @@ -619,7 +619,7 @@ set_config_result_t config_set_mode_in_whitelist(const char *mode, int allowed)

g_free(whitelist);

return(ret);
return ret;
}

/*
Expand Down Expand Up @@ -708,20 +708,20 @@ char * config_get_network_setting(const char *config)
ret = strdup("usb0");
}
else if(!strcmp(config, NETWORK_GATEWAY_KEY))
return(config_get_network_gateway());
return config_get_network_gateway();
else if(!strcmp(config, NETWORK_NETMASK_KEY))
{
ret = config_get_network_netmask();
if(!ret)
ret = strdup("255.255.255.0");
}
else if(!strcmp(config, NETWORK_NAT_INTERFACE_KEY))
return(config_get_network_nat_interface());
return config_get_network_nat_interface();
else
/* no matching keys, return error */
return(NULL);
return NULL;
end:
return(ret);
return ret;
}

/**
Expand Down Expand Up @@ -896,7 +896,7 @@ char * config_get_android_manufacturer(void)

char * config_get_android_vendor_id(void)
{
return(config_get_conf_string(ANDROID_ENTRY, ANDROID_VENDOR_ID_KEY));
return config_get_conf_string(ANDROID_ENTRY, ANDROID_VENDOR_ID_KEY);
}

char * config_get_android_product(void)
Expand All @@ -916,19 +916,19 @@ char * config_get_android_product(void)

char * config_get_android_product_id(void)
{
return(config_get_conf_string(ANDROID_ENTRY, ANDROID_PRODUCT_ID_KEY));
return config_get_conf_string(ANDROID_ENTRY, ANDROID_PRODUCT_ID_KEY);
}

char * config_get_hidden_modes(void)
{
return(config_get_conf_string(MODE_SETTING_ENTRY, MODE_HIDE_KEY));
return config_get_conf_string(MODE_SETTING_ENTRY, MODE_HIDE_KEY);
}
char * config_get_mode_whitelist(void)
{
return(config_get_conf_string(MODE_SETTING_ENTRY, MODE_WHITELIST_KEY));
return config_get_conf_string(MODE_SETTING_ENTRY, MODE_WHITELIST_KEY);
}

int config_is_roaming_not_allowed(void)
{
return(config_get_conf_int(NETWORK_ENTRY, NO_ROAMING_KEY));
return config_get_conf_int(NETWORK_ENTRY, NO_ROAMING_KEY);
}
12 changes: 6 additions & 6 deletions src/usb_moded-dbus.c
View file
Expand Up @@ -802,7 +802,7 @@ static int umdbus_send_signal_ex(const char *signal_type, const char *content)
*/
int umdbus_send_state_signal(const char *state_ind)
{
return(umdbus_send_signal_ex(USB_MODE_SIGNAL_NAME, state_ind));
return umdbus_send_signal_ex(USB_MODE_SIGNAL_NAME, state_ind);
}

/**
Expand All @@ -814,7 +814,7 @@ int umdbus_send_state_signal(const char *state_ind)
*/
int umdbus_send_error_signal(const char *error)
{
return(umdbus_send_signal_ex(USB_MODE_ERROR_SIGNAL_NAME, error));
return umdbus_send_signal_ex(USB_MODE_ERROR_SIGNAL_NAME, error);
}

/**
Expand All @@ -826,7 +826,7 @@ int umdbus_send_error_signal(const char *error)
*/
int umdbus_send_supported_modes_signal(const char *supported_modes)
{
return(umdbus_send_signal_ex(USB_MODE_SUPPORTED_MODES_SIGNAL_NAME, supported_modes));
return umdbus_send_signal_ex(USB_MODE_SUPPORTED_MODES_SIGNAL_NAME, supported_modes);
}

/**
Expand All @@ -838,7 +838,7 @@ int umdbus_send_supported_modes_signal(const char *supported_modes)
*/
int umdbus_send_available_modes_signal(const char *available_modes)
{
return(umdbus_send_signal_ex(USB_MODE_AVAILABLE_MODES_SIGNAL_NAME, available_modes));
return umdbus_send_signal_ex(USB_MODE_AVAILABLE_MODES_SIGNAL_NAME, available_modes);
}

/**
Expand All @@ -850,7 +850,7 @@ int umdbus_send_available_modes_signal(const char *available_modes)
*/
int umdbus_send_hidden_modes_signal(const char *hidden_modes)
{
return(umdbus_send_signal_ex(USB_MODE_HIDDEN_MODES_SIGNAL_NAME, hidden_modes));
return umdbus_send_signal_ex(USB_MODE_HIDDEN_MODES_SIGNAL_NAME, hidden_modes);
}

/**
Expand All @@ -861,7 +861,7 @@ int umdbus_send_hidden_modes_signal(const char *hidden_modes)
*/
int umdbus_send_whitelisted_modes_signal(const char *whitelist)
{
return(umdbus_send_signal_ex(USB_MODE_WHITELISTED_MODES_SIGNAL_NAME, whitelist));
return umdbus_send_signal_ex(USB_MODE_WHITELISTED_MODES_SIGNAL_NAME, whitelist);
}

/** Async reply handler for umdbus_get_name_owner_async()
Expand Down
2 changes: 1 addition & 1 deletion src/usb_moded-dyn-config.c
View file
Expand Up @@ -125,7 +125,7 @@ GList *dynconfig_read_mode_list(int diag)
log_debug("Mode confdir open failed or file is incomplete/invalid.\n");

modelist = g_list_sort (modelist, dynconfig_compare_modes);
return(modelist);
return modelist;
}

static mode_list_elem_t *dynconfig_read_mode_file(const gchar *filename)
Expand Down

0 comments on commit 3161f17

Please sign in to comment.