pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add function fc_trim to avoid conflict with trim

pull/37/head
yuqing 2017-02-27 16:08:55 +08:00
parent f6ad3bdb79
commit 5fb8531218
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,9 +1,10 @@
Version 1.35 2017-02-20 Version 1.35 2017-02-27
* logger judge log_level in function log_it_ex and log_it_ex1 * logger judge log_level in function log_it_ex and log_it_ex1
* add php extension function: fastcommon_file_put_contents * add php extension function: fastcommon_file_put_contents
* add function fc_safe_read and fc_safe_write * add function fc_safe_read and fc_safe_write
* add function fc_ftok * add function fc_ftok
* add function fc_trim to avoid conflict with trim
Version 1.34 2017-02-06 Version 1.34 2017-02-06
* ini_file_reader: LOCAL_IP support CIDR addresses * ini_file_reader: LOCAL_IP support CIDR addresses

26
src/ini_file_reader.c
View File

@ -86,6 +86,12 @@ static int iniDoLoadFromFile(const char *szFilename, \
static int iniLoadItemsFromBuffer(char *content, \ static int iniLoadItemsFromBuffer(char *content, \
IniContext *pContext); IniContext *pContext);
#define STR_TRIM(pStr) \
do { \
trim_right(pStr); \
trim_left(pStr); \
} while (0)
int iniSetAnnotationCallBack(AnnotationMap *map, int count) int iniSetAnnotationCallBack(AnnotationMap *map, int count)
{ {
int bytes; int bytes;
@ -423,7 +429,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
break; break;
} }
trim(pIncludeFilename); STR_TRIM(pIncludeFilename);
if (strncasecmp(pIncludeFilename, "http://", 7) == 0) if (strncasecmp(pIncludeFilename, "http://", 7) == 0)
{ {
snprintf(full_filename, sizeof(full_filename),\ snprintf(full_filename, sizeof(full_filename),\
@ -482,7 +488,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
} }
memcpy(pFuncName, pLine + 11, nNameLen); memcpy(pFuncName, pLine + 11, nNameLen);
pFuncName[nNameLen] = '\0'; pFuncName[nNameLen] = '\0';
trim(pFuncName); STR_TRIM(pFuncName);
if ((int)strlen(pFuncName) > 0) if ((int)strlen(pFuncName) > 0)
{ {
isAnnotation = 1; isAnnotation = 1;
@ -498,7 +504,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
continue; continue;
} }
trim(pLine); STR_TRIM(pLine);
if (*pLine == '#' || *pLine == '\0') if (*pLine == '#' || *pLine == '\0')
{ {
continue; continue;
@ -513,7 +519,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
*(pLine + (nLineLen - 1)) = '\0'; *(pLine + (nLineLen - 1)) = '\0';
section_name = pLine + 1; //skip [ section_name = pLine + 1; //skip [
trim(section_name); STR_TRIM(section_name);
if (*section_name == '\0') //global section if (*section_name == '\0') //global section
{ {
pContext->current_section = &pContext->global; pContext->current_section = &pContext->global;
@ -595,8 +601,8 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
memcpy(pItem->name, pLine, nNameLen); memcpy(pItem->name, pLine, nNameLen);
memcpy(pItem->value, pEqualChar + 1, nValueLen); memcpy(pItem->value, pEqualChar + 1, nValueLen);
trim(pItem->name); STR_TRIM(pItem->name);
trim(pItem->value); STR_TRIM(pItem->value);
if (isAnnotation) if (isAnnotation)
{ {
@ -1143,7 +1149,7 @@ static bool iniCalcCondition(char *condition, const int condition_len,
_PREPROCESS_MAX_LIST_VALUE_COUNT); _PREPROCESS_MAX_LIST_VALUE_COUNT);
for (i=0; i<count; i++) for (i=0; i<count; i++)
{ {
values[i] = trim(values[i]); values[i] = fc_trim(values[i]);
} }
if (varType == _PREPROCESS_VARIABLE_TYPE_LOCAL_HOST) if (varType == _PREPROCESS_VARIABLE_TYPE_LOCAL_HOST)
{ {
@ -1282,8 +1288,8 @@ static int iniDoProccessSet(char *pSet, char **ppSetEnd,
return ENOMEM; return ENOMEM;
} }
key = trim(parts[0]); key = fc_trim(parts[0]);
value = trim(parts[1]); value = fc_trim(parts[1]);
value_len = strlen(value); value_len = strlen(value);
if (value_len > 3 && (*value == '$' && *(value + 1) == '(') if (value_len > 3 && (*value == '$' && *(value + 1) == '(')
&& *(value + value_len - 1) == ')') && *(value + value_len - 1) == ')')
@ -1303,7 +1309,7 @@ static int iniDoProccessSet(char *pSet, char **ppSetEnd,
logWarning("file: "__FILE__", line: %d, " logWarning("file: "__FILE__", line: %d, "
"empty reply when exec: %s", __LINE__, cmd); "empty reply when exec: %s", __LINE__, cmd);
} }
value = trim(output); value = fc_trim(output);
value_len = strlen(value); value_len = strlen(value);
} }

2
src/local_ip_func.c
View File

@ -96,7 +96,7 @@ void load_local_host_ip_addrs()
if_alias_prefixes, STORAGE_MAX_ALIAS_PREFIX_COUNT); if_alias_prefixes, STORAGE_MAX_ALIAS_PREFIX_COUNT);
for (k=0; k<alias_count; k++) for (k=0; k<alias_count; k++)
{ {
trim(if_alias_prefixes[k]); fc_trim(if_alias_prefixes[k]);
} }
} }

12
src/shared_func.h
View File

@ -213,6 +213,18 @@ char *trim_right(char *pStr);
*/ */
char *trim(char *pStr); char *trim(char *pStr);
/** trim leading and tail spaces ( \t\r\n)
* parameters:
* pStr: the string to trim
* return: trimed string porinter as pStr
*/
static inline char *fc_trim(char *pStr)
{
trim_right(pStr);
trim_left(pStr);
return pStr;
}
/** copy string to BufferInfo /** copy string to BufferInfo
* parameters: * parameters:
* pBuff: the dest buffer * pBuff: the dest buffer