github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-05 02:40:37 +00:00
Code Issues Projects Releases Wiki Activity

dm: Fix some issues from string operations

Browse Source 
The patch fix some string operations issues and also improve readability
of several snippet.

Tracked-On: #2133
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Shuo A Liu
2018-12-20 11:00:31 +08:00
committed by wenlingz
parent 20d0e666ff
commit 3e0b06cfd6
7 changed files with 62 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
devicemodel/lib/dm_string.c
View File

@@ -8,23 +8,19 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include "dm_string.h"
int
dm_strtol(const char *s, char **end, unsigned int base, long *val)
{
if (!s)
goto err;
return -1;
*val = strtol(s, end, base);
if (*end == s) {
printf("ERROR! nothing covert for: %s!\n", s);
goto err;
}
if ((end && *end == s) || errno == ERANGE)
return -1;
return 0;
err:
return -1;
}
int
@@ -35,7 +31,8 @@ dm_strtoi(const char *s, char **end, unsigned int base, int *val)
l_val = 0;
ret = dm_strtol(s, end, base, &l_val);
*val = (int)l_val;
if (ret == 0)
*val = (int)l_val;
return ret;
}
@@ -43,17 +40,12 @@ int
dm_strtoul(const char *s, char **end, unsigned int base, unsigned long *val)
{
if (!s)
goto err;
return -1;
*val = strtoul(s, end, base);
if (*end == s) {
printf("ERROR! nothing covert for: %s!\n", s);
goto err;
}
if ((end && *end == s) || errno == ERANGE)
return -1;
return 0;
err:
return -1;
}
int
@@ -64,6 +56,7 @@ dm_strtoui(const char *s, char **end, unsigned int base, unsigned int *val)
l_val = 0;
ret = dm_strtoul(s, end, base, &l_val);
*val = (unsigned int)l_val;
if (ret == 0)
*val = (unsigned int)l_val;
return ret;
}