sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

r25216: make talloc_append_string() a deprecated macro instead of

Browse Source 
having it as a real function.

metze
This commit is contained in:
Stefan Metzmacher 2007-09-18 13:45:43 +00:00 committed by Gerald (Jerry) Carter
parent 8f2db3c130
commit 2b2e841465
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/lib/talloc/talloc.c
View File

@ -1132,32 +1132,6 @@ char *talloc_strdup(const void *t, const char *p)
return __talloc_strlendup(t, p, strlen(p));
}
/*
append to a talloced string
*/
char *talloc_append_string(const void *t, char *orig, const char *append)
{
char *ret;
size_t olen = strlen(orig);
size_t alenz;
if (!append)
return orig;
alenz = strlen(append) + 1;
ret = talloc_realloc(t, orig, char, olen + alenz);
if (!ret)
return NULL;
/* append the string with the trailing \0 */
memcpy(&ret[olen], append, alenz);
_talloc_set_name_const(ret, ret);
return ret;
}
/*
strndup with a talloc
*/

3
source/lib/talloc/talloc.h
View File

@ -111,6 +111,7 @@ typedef void TALLOC_CTX;
#define talloc_array_p(ctx, type, count) talloc_array(ctx, type, count)
#define talloc_realloc_p(ctx, p, type, count) talloc_realloc(ctx, p, type, count)
#define talloc_destroy(ctx) talloc_free(ctx)
#define talloc_append_string(c, s, a) (s?talloc_strdup_append(s,a):talloc_strdup(c, a))
#endif
/* The following definitions come from talloc.c */
@ -178,6 +179,4 @@ char *talloc_asprintf(const void *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3)
char *talloc_asprintf_append(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
char *talloc_asprintf_append_buffer(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
char *talloc_append_string(const void *t, char *orig, const char *append);
#endif