Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change strdup to use MsStrdup throughout codebase #5321

Merged
merged 3 commits into from Sep 19, 2016
Merged

Change strdup to use MsStrdup throughout codebase #5321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3b3948
Replace strdup with msStrdup
Sep 3, 2016
dcb8291
Replace strdup with msStrdup in mapscript files
Sep 3, 2016
d9ce708
Remove the mapserver provided strdup() function and the HAVE_STRDUP c…
Sep 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Expand Up @@ -92,7 +92,6 @@ endif(NOT(WIN32))
check_function_exists("strrstr" HAVE_STRRSTR)
check_function_exists("strcasecmp" HAVE_STRCASECMP)
check_function_exists("strcasestr" HAVE_STRCASESTR)
check_function_exists("strdup" HAVE_STRDUP)
check_function_exists("strlcat" HAVE_STRLCAT)
check_function_exists("strlcpy" HAVE_STRLCPY)
check_function_exists("strlen" HAVE_STRLEN)
Expand Down
2 changes: 1 addition & 1 deletion mapcopy.h
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@
if ((_dst) != NULL) \
msFree((_dst)); \
if ((_src)) \
(_dst) = strdup((_src)); \
(_dst) = msStrdup((_src)); \
else \
(_dst) = NULL; \
MS_MACROEND
Expand Down
2 changes: 1 addition & 1 deletion mapfile.c
View file
Open in desktop
Expand Up @@ -1909,7 +1909,7 @@ static int loadLabel(labelObj *label)
if(label->position == MS_BINDING) {
if(label->bindings[MS_LABEL_BINDING_POSITION].item != NULL)
msFree(label->bindings[MS_LABEL_BINDING_POSITION].item);
label->bindings[MS_LABEL_BINDING_POSITION].item = strdup(msyystring_buffer);
label->bindings[MS_LABEL_BINDING_POSITION].item = msStrdup(msyystring_buffer);
label->numbindings++;
}
break;
Expand Down
4 changes: 2 additions & 2 deletions mapogcsld.c
View file
Open in desktop
Expand Up @@ -201,9 +201,9 @@ int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer, char *pszStyleLayerNa
map->numlayers);
if (psTmpLayer->name)
msFree(psTmpLayer->name);
psTmpLayer->name = strdup(tmpId);
psTmpLayer->name = msStrdup(tmpId);
msFree(pasLayers[l].name);
pasLayers[l].name = strdup(tmpId);
pasLayers[l].name = msStrdup(tmpId);
msInsertLayer(map, psTmpLayer, -1);
MS_REFCNT_DECR(psTmpLayer);
}
Expand Down
2 changes: 1 addition & 1 deletion mapogr.cpp
View file
Open in desktop
Expand Up @@ -3801,7 +3801,7 @@ static int msOGRUpdateStyleParseLabel(mapObj *map, layerObj *layer, classObj *c,
/* replace spaces with hyphens to allow mapping to a valid hashtable entry*/
char* pszFontNameEscaped = NULL;
if (pszFontName != NULL) {
pszFontNameEscaped = strdup(pszFontName);
pszFontNameEscaped = msStrdup(pszFontName);
msReplaceChar(pszFontNameEscaped, ' ', '-');
}

Expand Down
4 changes: 2 additions & 2 deletions mapoutput.c
View file
Open in desktop
Expand Up @@ -313,9 +313,9 @@ outputFormatObj *msCreateDefaultOutputFormat( mapObj *map,
else if( strcasecmp(driver,"KMZ") == 0 ) {
if(!name) name="kmz";
format = msAllocOutputFormat( map, name, driver );
format->mimetype = strdup("application/vnd.google-earth.kmz");
format->mimetype = msStrdup("application/vnd.google-earth.kmz");
format->imagemode = MS_IMAGEMODE_RGB;
format->extension = strdup("kmz");
format->extension = msStrdup("kmz");
format->renderer = MS_RENDER_WITH_KML;
msSetOutputFormatOption( format, "ATTACHMENT", "mapserver.kmz");
}
Expand Down
10 changes: 5 additions & 5 deletions mapparser.c
View file
Open in desktop
Expand Up @@ -1700,9 +1700,9 @@ int yynerrs;
break;
case(MS_PARSE_TYPE_STRING):
if((yyvsp[(1) - (1)].intval))
p->result.strval = strdup("true");
p->result.strval = msStrdup("true");
else
p->result.strval = strdup("false");
p->result.strval = msStrdup("false");
break;
}
}
Expand Down Expand Up @@ -1737,7 +1737,7 @@ int yynerrs;
p->result.intval = MS_FALSE;
break;
case(MS_PARSE_TYPE_STRING):
p->result.strval = (yyvsp[(1) - (1)].strval); // strdup($1);
p->result.strval = (yyvsp[(1) - (1)].strval); // msStrdup($1);
break;
}
}
Expand Down Expand Up @@ -3002,7 +3002,7 @@ int yylex(YYSTYPE *lvalp, parseObj *p)
case MS_TOKEN_LITERAL_STRING:
// printf("token value = %s\n", p->expr->curtoken->tokenval.strval);
token = STRING;
(*lvalp).strval = strdup(p->expr->curtoken->tokenval.strval);
(*lvalp).strval = msStrdup(p->expr->curtoken->tokenval.strval);
break;
case MS_TOKEN_LITERAL_TIME:
token = TIME;
Expand Down Expand Up @@ -3041,7 +3041,7 @@ int yylex(YYSTYPE *lvalp, parseObj *p)
break;
case MS_TOKEN_BINDING_STRING:
token = STRING;
(*lvalp).strval = strdup(p->shape->values[p->expr->curtoken->tokenval.bindval.index]);
(*lvalp).strval = msStrdup(p->shape->values[p->expr->curtoken->tokenval.bindval.index]);
break;
case MS_TOKEN_BINDING_SHAPE:
token = SHAPE;
Expand Down
10 changes: 5 additions & 5 deletions mapparser.y
View file
Open in desktop
Expand Up @@ -73,9 +73,9 @@ input: /* empty string */
break;
case(MS_PARSE_TYPE_STRING):
if($1)
p->result.strval = strdup("true");
p->result.strval = msStrdup("true");
else
p->result.strval = strdup("false");
p->result.strval = msStrdup("false");
break;
}
}
Expand All @@ -102,7 +102,7 @@ input: /* empty string */
p->result.intval = MS_FALSE;
break;
case(MS_PARSE_TYPE_STRING):
p->result.strval = $1; // strdup($1);
p->result.strval = $1; // msStrdup($1);
break;
}
}
Expand Down Expand Up @@ -817,7 +817,7 @@ int yylex(YYSTYPE *lvalp, parseObj *p)
case MS_TOKEN_LITERAL_STRING:
// printf("token value = %s\n", p->expr->curtoken->tokenval.strval);
token = STRING;
(*lvalp).strval = strdup(p->expr->curtoken->tokenval.strval);
(*lvalp).strval = msStrdup(p->expr->curtoken->tokenval.strval);
break;
case MS_TOKEN_LITERAL_TIME:
token = TIME;
Expand Down Expand Up @@ -856,7 +856,7 @@ int yylex(YYSTYPE *lvalp, parseObj *p)
break;
case MS_TOKEN_BINDING_STRING:
token = STRING;
(*lvalp).strval = strdup(p->shape->values[p->expr->curtoken->tokenval.bindval.index]);
(*lvalp).strval = msStrdup(p->shape->values[p->expr->curtoken->tokenval.bindval.index]);
break;
case MS_TOKEN_BINDING_SHAPE:
token = SHAPE;
Expand Down
6 changes: 3 additions & 3 deletions mapquery.c
View file
Open in desktop
Expand Up @@ -580,7 +580,7 @@ static char *filterTranslateToLogical(expressionObj *filter, char *filteritem) {
char *string = NULL;

if(filter->type == MS_STRING && filteritem) {
string = strdup("'[");
string = msStrdup("'[");
string = msStringConcatenate(string, filteritem);
string = msStringConcatenate(string, "]'");
if(filter->flags & MS_EXP_INSENSITIVE)
Expand All @@ -590,7 +590,7 @@ static char *filterTranslateToLogical(expressionObj *filter, char *filteritem) {
string = msStringConcatenate(string, filter->string);
string = msStringConcatenate(string, "'");
} else if(filter->type == MS_REGEX && filteritem) {
string = strdup("'[");
string = msStrdup("'[");
string = msStringConcatenate(string, filteritem);
string = msStringConcatenate(string, "]'");
if(filter->flags & MS_EXP_INSENSITIVE)
Expand Down Expand Up @@ -626,7 +626,7 @@ static expressionObj mergeFilters(expressionObj *filter1, char *filteritem1, exp
return filter; /* should only happen if the filter was a native filter */
}

filter.string = strdup(tmpstr1);
filter.string = msStrdup(tmpstr1);
filter.string = msStringConcatenate(filter.string, " AND ");
filter.string = msStringConcatenate(filter.string, tmpstr2);

Expand Down
2 changes: 1 addition & 1 deletion mapscript/php/label.c
View file
Open in desktop
Expand Up @@ -322,7 +322,7 @@ PHP_METHOD(labelObj, setBinding)
php_label->label->numbindings--;
}

php_label->label->bindings[bindingId].item = strdup(value);
php_label->label->bindings[bindingId].item = msStrdup(value);
php_label->label->numbindings++;

RETURN_LONG(MS_SUCCESS);
Expand Down
2 changes: 1 addition & 1 deletion mapscript/php/layer.c
View file
Open in desktop
Expand Up @@ -1506,7 +1506,7 @@ PHP_METHOD(layerObj, setProcessing)
else
php_layer->layer->processing = (char **) realloc(php_layer->layer->processing, sizeof(char*) * (php_layer->layer->numprocessing+1));

php_layer->layer->processing[php_layer->layer->numprocessing-1] = strdup(string);
php_layer->layer->processing[php_layer->layer->numprocessing-1] = msStrdup(string);
php_layer->layer->processing[php_layer->layer->numprocessing] = NULL;

RETURN_LONG(MS_SUCCESS);
Expand Down
2 changes: 1 addition & 1 deletion mapscript/php/map.c
View file
Open in desktop
Expand Up @@ -3162,7 +3162,7 @@ PHP_METHOD(mapObj, loadOwsParameters)
php_request = (php_owsrequest_object *) zend_object_store_get_object(zrequest TSRMLS_CC);

if (!version) {
version = strdup("1.1.1");
version = msStrdup("1.1.1");
isZval = 0;
}

Expand Down
20 changes: 10 additions & 10 deletions mapscript/php/mapscript_i.c
View file
Open in desktop
Expand Up @@ -215,7 +215,7 @@ int mapObj_queryByFilter(mapObj* self, char *string)
self->query.type = MS_QUERY_BY_FILTER;
self->query.mode = MS_QUERY_MULTIPLE;

self->query.filter.string = strdup(string);
self->query.filter.string = msStrdup(string);
self->query.filter.type = MS_EXPRESSION;

self->query.rect = self->extent;
Expand Down Expand Up @@ -351,7 +351,7 @@ int mapObj_setSymbolSet(mapObj *self,
msInitSymbolSet(&self->symbolset);

// Set symbolset filename
self->symbolset.filename = strdup(szFileName);
self->symbolset.filename = msStrdup(szFileName);

// Symbolset shares same fontset as main mapfile
self->symbolset.fontset = &(self->fontset);
Expand All @@ -370,7 +370,7 @@ int mapObj_setFontSet(mapObj *self, char *szFileName)
msInitFontSet(&(self->fontset));

// Set fontset filename
self->fontset.filename = strdup(szFileName);
self->fontset.filename = msStrdup(szFileName);

return msLoadFontSet(&(self->fontset), self);
}
Expand Down Expand Up @@ -711,7 +711,7 @@ int layerObj_queryByFilter(layerObj *self, mapObj *map, char *string)
map->query.type = MS_QUERY_BY_FILTER;
map->query.mode = MS_QUERY_MULTIPLE;

map->query.filter.string = strdup(string);
map->query.filter.string = msStrdup(string);
map->query.filter.type = MS_EXPRESSION;

map->query.layer = self->index;
Expand Down Expand Up @@ -1551,7 +1551,7 @@ int rectObj_draw(rectObj *self, mapObj *map, layerObj *layer,
shape.classindex = classindex;

if(text && layer->class[classindex]->numlabels > 0) {
shape.text = strdup(text);
shape.text = msStrdup(text);
}

if(MS_SUCCESS != msDrawShape(map, layer, &shape, img, -1, MS_DRAWMODE_FEATURES|MS_DRAWMODE_LABELS)) {
Expand Down Expand Up @@ -1837,13 +1837,13 @@ void cgirequestObj_setParameter(cgiRequestObj *self, char *name, char *value)
for (i=0; i<self->NumParams; i++) {
if (strcasecmp(self->ParamNames[i], name) == 0) {
free(self->ParamValues[i]);
self->ParamValues[i] = strdup(value);
self->ParamValues[i] = msStrdup(value);
break;
}
}
if (i == self->NumParams) {
self->ParamNames[self->NumParams] = strdup(name);
self->ParamValues[self->NumParams] = strdup(value);
self->ParamNames[self->NumParams] = msStrdup(name);
self->ParamValues[self->NumParams] = msStrdup(value);
self->NumParams++;
}
}
Expand All @@ -1853,8 +1853,8 @@ void cgirequestObj_addParameter(cgiRequestObj *self, char *name, char *value)
if (self->NumParams == MS_DEFAULT_CGI_PARAMS) {
msSetError(MS_CHILDERR, "Maximum number of items, %d, has been reached", "addParameter()", MS_DEFAULT_CGI_PARAMS);
}
self->ParamNames[self->NumParams] = strdup(name);
self->ParamValues[self->NumParams] = strdup(value);
self->ParamNames[self->NumParams] = msStrdup(name);
self->ParamValues[self->NumParams] = msStrdup(value);
self->NumParams++;
}

Expand Down
2 changes: 1 addition & 1 deletion mapscript/php/php_mapscript_util.h
View file
Open in desktop
Expand Up @@ -221,7 +221,7 @@ static zend_always_inline zend_bool zval_set_isref_to_p(zval* pz, zend_bool isre
convert_to_string(value); \
if (internal) free(internal); \
if (Z_STRVAL_P(value)) \
internal = strdup(Z_STRVAL_P(value)); \
internal = msStrdup(Z_STRVAL_P(value)); \
}

#define IF_SET_LONG(property_name, internal, value) \
Expand Down
2 changes: 1 addition & 1 deletion mapscript/php/php_proj.c
View file
Open in desktop
Expand Up @@ -353,7 +353,7 @@ DLEXPORT void php_proj_pj_init(INTERNAL_FUNCTION_PARAMETERS)
(void **)&pParam) != FAILURE) {
convert_to_string((*pParam));
if ((*pParam)->value.str.val != NULL)
papszBuf[i] = strdup((*pParam)->value.str.val);
papszBuf[i] = msStrdup((*pParam)->value.str.val);
}
}
papszBuf[i] = NULL;
Expand Down
4 changes: 2 additions & 2 deletions mapscript/php/style.c
View file
Open in desktop
Expand Up @@ -256,7 +256,7 @@ PHP_METHOD(styleObj, __set)
convert_to_string(value);
if (php_style->style->symbolname) free(php_style->style->symbolname);
if (Z_STRVAL_P(value))
php_style->style->symbolname = strdup(Z_STRVAL_P(value));
php_style->style->symbolname = msStrdup(Z_STRVAL_P(value));

/* The parent can be a classObj or a labelCacheMemberObj */
if (Z_OBJCE_P(php_style->parent.val) == mapscript_ce_class) {
Expand Down Expand Up @@ -403,7 +403,7 @@ PHP_METHOD(styleObj, setBinding)
php_style->style->numbindings--;
}

php_style->style->bindings[bindingId].item = strdup(value);
php_style->style->bindings[bindingId].item = msStrdup(value);
php_style->style->numbindings++;

RETURN_LONG(MS_SUCCESS);
Expand Down
2 changes: 1 addition & 1 deletion mapscript/swiginc/label.i
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@
self->numbindings--;
}

self->bindings[binding].item = strdup(item);
self->bindings[binding].item = msStrdup(item);
self->numbindings++;

return MS_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion mapscript/swiginc/layer.i
View file
Open in desktop
Expand Up @@ -303,7 +303,7 @@
map->query.type = MS_QUERY_BY_FILTER;
map->query.mode = MS_QUERY_MULTIPLE;

map->query.filter.string = strdup(string);
map->query.filter.string = msStrdup(string);
map->query.filter.type = MS_EXPRESSION;

map->query.layer = self->index;
Expand Down
10 changes: 5 additions & 5 deletions mapscript/swiginc/map.i
View file
Open in desktop
Expand Up @@ -168,7 +168,7 @@
else
{
msFree( self->imagetype );
self->imagetype = strdup(imagetype);
self->imagetype = msStrdup(imagetype);
msApplyOutputFormat( &(self->outputformat), format, MS_NOOVERRIDE,
MS_NOOVERRIDE, MS_NOOVERRIDE );
}
Expand All @@ -185,7 +185,7 @@
else
{
msFree( self->imagetype );
self->imagetype = strdup(imagetype);
self->imagetype = msStrdup(imagetype);
msApplyOutputFormat( &(self->outputformat), format, MS_NOOVERRIDE,
MS_NOOVERRIDE, MS_NOOVERRIDE );
}
Expand Down Expand Up @@ -260,7 +260,7 @@
self->query.type = MS_QUERY_BY_FILTER;
self->query.mode = MS_QUERY_MULTIPLE;

self->query.filter.string = strdup(string);
self->query.filter.string = msStrdup(string);
self->query.filter.type = MS_EXPRESSION;

self->query.rect = self->extent;
Expand Down Expand Up @@ -375,7 +375,7 @@
msFreeSymbolSet(&self->symbolset);
msInitSymbolSet(&self->symbolset);

self->symbolset.filename = strdup(szFileName);
self->symbolset.filename = msStrdup(szFileName);

/* Symbolset shares same fontset as main mapfile */
self->symbolset.fontset = &(self->fontset);
Expand All @@ -391,7 +391,7 @@
msFreeFontSet(&(self->fontset));
msInitFontSet(&(self->fontset));

self->fontset.filename = strdup(filename);
self->fontset.filename = msStrdup(filename);

return msLoadFontSet(&(self->fontset), self);
}
Expand Down
8 changes: 4 additions & 4 deletions mapscript/swiginc/outputformat.i
View file
Open in desktop
Expand Up @@ -64,13 +64,13 @@
void setExtension( const char *extension )
{
msFree( self->extension );
self->extension = strdup(extension);
self->extension = msStrdup(extension);
}

void setMimetype( const char *mimetype )
{
msFree( self->mimetype );
self->mimetype = strdup(mimetype);
self->mimetype = msStrdup(mimetype);
}
#endif

Expand All @@ -87,13 +87,13 @@
%newobject getOption;
char *getOption(const char *key, const char *value="")
{
return strdup(msGetOutputFormatOption(self, key, value));
return msStrdup(msGetOutputFormatOption(self, key, value));
}

%newobject getOptionAt;
char* getOptionAt(int i) {
if( i >= 0 && i < self->numformatoptions ) {
return strdup(self->formatoptions[i]);
return msStrdup(self->formatoptions[i]);
}
return NULL;
}
Expand Down