package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-12 20:40:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[rk_env]: add default value to env_get function

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@35 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-05 08:46:46 +00:00
parent ef042eb9df
commit 1fe9a769fc
11 changed files with 106 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
osal/android/os_env.c
View File

@@ -25,49 +25,52 @@
* So the library should compiled on latest ndk
*/
RK_S32 os_get_env_u32(const char *name, RK_U32 *val)
RK_S32 os_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value)
{
RK_S32 ret = -1;
char value[PROP_VALUE_MAX+1];
int len = __system_property_get(name, value);
*val = 0;
char prop[PROP_VALUE_MAX+1];
int len = __system_property_get(name, prop);
if (len > 0) {
char *endptr;
int base = (value[0] == '0' && value[1] == 'x')?(16):(10);
int base = (prop[0] == '0' && prop[1] == 'x')?(16):(10);
errno = 0;
*val = strtoul(value, &endptr, base);
if (errno || (value == endptr)) {
*value = strtoul(prop, &endptr, base);
if (errno || (prop == endptr)) {
errno = 0;
} else {
ret = 0;
*value = default_value;
}
} else {
*value = default_value;
}
return ret;
return 0;
}
RK_S32 os_get_env_str(const char *name, char **val)
RK_S32 os_get_env_str(const char *name, char **value, char *default_value)
{
// use unsigned char to avoid warnning
static unsigned char env_str[2][PROP_VALUE_MAX+1];
static RK_U32 env_idx = 0;
char *value = (char *)env_str[env_idx];
int len = __system_property_get(name, value);
*val = (len)?(value):(NULL);
env_idx = (len)?(!env_idx):(env_idx);
return (len)?(0):(-1);
char *prop = (char *)env_str[env_idx];
int len = __system_property_get(name, prop);
if (len > 0) {
*value = prop;
env_idx = !env_idx;
} else {
*value = default_value;
}
return 0;
}
RK_S32 os_set_env_u32(const char *name, RK_U32 val)
RK_S32 os_set_env_u32(const char *name, RK_U32 value)
{
char buf[PROP_VALUE_MAX+1+2];
snprintf(buf, sizeof(buf), "0x%x", val);
snprintf(buf, sizeof(buf), "0x%x", value);
int len = __system_property_set(name, buf);
return (len)?(0):(-1);
}
RK_S32 os_set_env_str(const char *name, char *val)
RK_S32 os_set_env_str(const char *name, char *value)
{
int len = __system_property_set(name, val);
int len = __system_property_set(name, value);
return (len)?(0):(-1);
}