diff options
| author | Jeremy Allison <jra@samba.org> | 2007-09-14 23:21:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:06:46 -0500 |
| commit | 9a012df08ee829c1d40fc88ba12a0ea479f60be0 (patch) | |
| tree | 98fc38abc69111d06d29b0f7c57a5f3372bdcbed /source4/scripting/ejs | |
| parent | 6f37a17d4a66c67de974cec14ebdf627114a397e (diff) | |
| download | samba-9a012df08ee829c1d40fc88ba12a0ea479f60be0.tar.gz samba-9a012df08ee829c1d40fc88ba12a0ea479f60be0.tar.bz2 samba-9a012df08ee829c1d40fc88ba12a0ea479f60be0.zip | |
r25175: Change to talloc_asprintf_append_buffer().
Jeremy.
(This used to be commit 0844dbf597191b3e4d35a696695b229e986daec4)
Diffstat (limited to 'source4/scripting/ejs')
| -rw-r--r-- | source4/scripting/ejs/smbcalls_string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c index 215ce77b77..541303ff2d 100644 --- a/source4/scripting/ejs/smbcalls_string.c +++ b/source4/scripting/ejs/smbcalls_string.c @@ -238,7 +238,7 @@ static int ejs_join(MprVarHandle eid, int argc, struct MprVar **argv) goto failed; } for (i=1;list[i];i++) { - ret = talloc_asprintf_append(ret, "%s%s", separator, list[i]); + ret = talloc_asprintf_append_buffer(ret, "%s%s", separator, list[i]); if (ret == NULL) { goto failed; } @@ -275,7 +275,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv) ret = talloc_strdup(tmp_ctx, ""); /* avoid all the format string warnings */ - _asprintf_append = (_asprintf_append_t)talloc_asprintf_append; + _asprintf_append = (_asprintf_append_t)talloc_asprintf_append_buffer; /* hackity hack ... @@ -284,7 +284,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv) char *fmt2; int len, len_count=0; char *tstr; - ret = talloc_asprintf_append(ret, "%*.*s", + ret = talloc_asprintf_append_buffer(ret, "%*.*s", (int)(p-format), (int)(p-format), format); if (ret == NULL) goto failed; @@ -299,7 +299,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv) tstr--; } if (strcmp(tstr, "%") == 0) { - ret = talloc_asprintf_append(ret, "%%"); + ret = talloc_asprintf_append_buffer(ret, "%%"); if (ret == NULL) { goto failed; } @@ -372,7 +372,7 @@ static int ejs_sprintf(MprVarHandle eid, int argc, struct MprVar **argv) format += len+1; } - ret = talloc_asprintf_append(ret, "%s", format); + ret = talloc_asprintf_append_buffer(ret, "%s", format); mpr_Return(eid, mprString(ret)); talloc_free(tmp_ctx); return 0; |