diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 13:06:14 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-19 13:06:14 +0200 |
commit | f0c4829e827210e6f58885994e18f77f9afc3b8c (patch) | |
tree | e3dc275e48331b89add00fddeae2d89d1dc7b93d /source3/utils | |
parent | 58b4efc9b49c1cc366303a306639a3fc9321dcfe (diff) | |
download | samba-f0c4829e827210e6f58885994e18f77f9afc3b8c.tar.gz samba-f0c4829e827210e6f58885994e18f77f9afc3b8c.tar.bz2 samba-f0c4829e827210e6f58885994e18f77f9afc3b8c.zip |
Remove silly safe_free() function which is a wrapper around SAFE_FREE().
Since it's a function it just sets the local pointer to NULL and basically
is an equivalent to free().
It also claims it's being used for callbacks but isn't used that way
anywhere.
Diffstat (limited to 'source3/utils')
-rw-r--r-- | source3/utils/net_ads.c | 4 | ||||
-rw-r--r-- | source3/utils/net_rpc_printer.c | 2 | ||||
-rw-r--r-- | source3/utils/nmblookup.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 8e8dd7e767..5a2d535b30 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -480,7 +480,7 @@ static int ads_user_add(struct net_context *c, int argc, const char **argv) asprintf(&upn, "%s@%s", argv[0], ads->config.realm); status = ads_krb5_set_password(ads->auth.kdc_server, upn, argv[1], ads->auth.time_offset); - safe_free(upn); + SAFE_FREE(upn); if (ADS_ERR_OK(status)) { d_printf("User %s added\n", argv[0]); rc = 0; @@ -534,7 +534,7 @@ static int ads_user_info(struct net_context *c, int argc, const char **argv) asprintf(&searchstring, "(sAMAccountName=%s)", escaped_user); rc = ads_search(ads, &res, searchstring, attrs); - safe_free(searchstring); + SAFE_FREE(searchstring); if (!ADS_ERR_OK(rc)) { d_fprintf(stderr, "ads_search: %s\n", ads_errstr(rc)); diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index f4b305d4ab..ddd18a7b9f 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -2482,7 +2482,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, TALLOC_FREE( reg_ctr ); } - safe_free(keylist); + SAFE_FREE(keylist); /* close printer handles here */ if (got_hnd_src) { diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index c04b628b1b..45da3f1e88 100644 --- a/source3/utils/nmblookup.c +++ b/source3/utils/nmblookup.c @@ -219,7 +219,7 @@ static bool query_one(const char *lookup, unsigned int lookup_type) } } - safe_free(ip_list); + free(ip_list); return (ip_list != NULL); } |