diff options
| author | Björn Baumbach <bb@sernet.de> | 2014-04-14 14:37:29 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-05-20 11:50:11 +0200 |
| commit | 60dbfbdadf7bce70cb2f74a79afe04017da3035d (patch) | |
| tree | 5274c6d3622863574fa4e6f6dc6fbac8fdbc99de /lib | |
| parent | 2763d0f0671c852d71938dbbef768ee80f9b2b80 (diff) | |
| download | samba-60dbfbdadf7bce70cb2f74a79afe04017da3035d.tar.gz | |
lib-util: rename memdup to smb_memdup and fix all callers (bug #10556)
Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit fae7e5d771d1c69bded1189b23335647023fa0f7)
Conflicts:
ctdb/lib/util/util.h
Also renamed memdup() in source3/locking/brlock.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/samba_util.h | 2 | ||||
| -rw-r--r-- | lib/util/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index 29967103ea..e3fe6a6079 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -739,7 +739,7 @@ char *smb_xstrndup(const char *s, size_t n); /** Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size); +_PUBLIC_ void *smb_memdup(const void *p, size_t size); /** * Write a password to the log file. diff --git a/lib/util/util.c b/lib/util/util.c index 3e9047ca91..35c18963b9 100644 --- a/lib/util/util.c +++ b/lib/util/util.c @@ -693,7 +693,7 @@ char *smb_xstrndup(const char *s, size_t n) Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size) +_PUBLIC_ void *smb_memdup(const void *p, size_t size) { void *p2; if (size == 0) |