nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Use our dupstr instead of strdup

Browse Source
This commit is contained in:
Pasi Kallinen
2015-04-13 10:07:12 +03:00
parent ee5002210f
commit 0b0c769a05
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sp_lev.c
+6 -6
View File
@@ -408,7 +408,7 @@ opvar_clone(ov)
case SPOVAR_VARIABLE: case SPOVAR_VARIABLE:
case SPOVAR_STRING: case SPOVAR_STRING:
case SPOVAR_SEL: case SPOVAR_SEL:
tmpov->vardata.str = strdup(ov->vardata.str); tmpov->vardata.str = dupstr(ov->vardata.str);
break; break;
default: impossible("Unknown push value type (%i)!", ov->spovartyp); default: impossible("Unknown push value type (%i)!", ov->spovartyp);
} }
@@ -2678,7 +2678,7 @@ spo_monster(coder)
case SP_M_V_NAME: case SP_M_V_NAME:
if ((OV_typ(parm) == SPOVAR_STRING) && if ((OV_typ(parm) == SPOVAR_STRING) &&
!tmpmons.name.str) !tmpmons.name.str)
tmpmons.name.str = strdup(OV_s(parm)); tmpmons.name.str = dupstr(OV_s(parm));
break; break;
case SP_M_V_APPEAR: case SP_M_V_APPEAR:
if ((OV_typ(parm) == SPOVAR_INT) && if ((OV_typ(parm) == SPOVAR_INT) &&
@@ -2686,7 +2686,7 @@ spo_monster(coder)
tmpmons.appear = OV_i(parm); tmpmons.appear = OV_i(parm);
opvar_free(parm); opvar_free(parm);
OV_pop(parm); OV_pop(parm);
tmpmons.appear_as.str = strdup(OV_s(parm)); tmpmons.appear_as.str = dupstr(OV_s(parm));
} }
break; break;
case SP_M_V_ASLEEP: case SP_M_V_ASLEEP:
@@ -2821,7 +2821,7 @@ spo_object(coder)
case SP_O_V_NAME: case SP_O_V_NAME:
if ((OV_typ(parm) == SPOVAR_STRING) && if ((OV_typ(parm) == SPOVAR_STRING) &&
!tmpobj.name.str) !tmpobj.name.str)
tmpobj.name.str = strdup(OV_s(parm)); tmpobj.name.str = dupstr(OV_s(parm));
break; break;
case SP_O_V_CORPSENM: case SP_O_V_CORPSENM:
if (OV_typ(parm) == SPOVAR_MONST) { if (OV_typ(parm) == SPOVAR_MONST) {
@@ -3926,7 +3926,7 @@ spo_levregion(coder)
tmplregion->del_islev = OV_i(del_islev); tmplregion->del_islev = OV_i(del_islev);
tmplregion->rtype = OV_i(rtype); tmplregion->rtype = OV_i(rtype);
tmplregion->padding = OV_i(padding); tmplregion->padding = OV_i(padding);
tmplregion->rname.str = strdup(OV_s(rname)); tmplregion->rname.str = dupstr(OV_s(rname));
if(!tmplregion->in_islev) { if(!tmplregion->in_islev) {
get_location(&tmplregion->inarea.x1, &tmplregion->inarea.y1, get_location(&tmplregion->inarea.x1, &tmplregion->inarea.y1,
@@ -4495,7 +4495,7 @@ spo_var_init(coder)
tmpvar = (struct splev_var *)malloc(sizeof(struct splev_var)); tmpvar = (struct splev_var *)malloc(sizeof(struct splev_var));
if (!tmpvar) panic("newvar tmpvar alloc"); if (!tmpvar) panic("newvar tmpvar alloc");
tmpvar->next = coder->frame->variables; tmpvar->next = coder->frame->variables;
tmpvar->name = strdup(OV_s(vname)); tmpvar->name = dupstr(OV_s(vname));
coder->frame->variables = tmpvar; coder->frame->variables = tmpvar;
if (OV_i(arraylen) < 0) { if (OV_i(arraylen) < 0) {