summaryrefslogtreecommitdiff
path: root/source3/libsmb/clirap.c
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2001-09-17 03:33:37 +0000
committerSimo Sorce <idra@samba.org>2001-09-17 03:33:37 +0000
commitbcbd75f7add425ebee760ddbd2e80a1d4a51e619 (patch)
treeb434877ae75febe93b4a1cb67cd2585d8bfd2a1a /source3/libsmb/clirap.c
parent484a7c0341fe033fe26fe1e6b597ed1c456c39d4 (diff)
downloadsamba-bcbd75f7add425ebee760ddbd2e80a1d4a51e619.tar.gz
samba-bcbd75f7add425ebee760ddbd2e80a1d4a51e619.tar.bz2
samba-bcbd75f7add425ebee760ddbd2e80a1d4a51e619.zip
move to SAFE_FREE()
(This used to be commit 48fc6a6cd52e01b287030fbbf0aa08a6814c5e11)
Diffstat (limited to 'source3/libsmb/clirap.c')
-rw-r--r--source3/libsmb/clirap.c40
1 files changed, 16 insertions, 24 deletions
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index bfbe478191..90f4d546d1 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -124,10 +124,8 @@ BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation)
}
}
- if (rparam)
- free(rparam);
- if (rdata)
- free(rdata);
+ SAFE_FREE(rparam);
+ SAFE_FREE(rdata);
return (cli->rap_error == 0);
}
@@ -193,10 +191,8 @@ int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, co
DEBUG(4,("NetShareEnum failed\n"));
}
- if (rparam)
- free(rparam);
- if (rdata)
- free(rdata);
+ SAFE_FREE(rparam);
+ SAFE_FREE(rdata);
return count;
}
@@ -271,10 +267,8 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
}
}
- if (rparam)
- free(rparam);
- if (rdata)
- free(rdata);
+ SAFE_FREE(rparam);
+ SAFE_FREE(rdata);
return(count > 0);
}
@@ -363,10 +357,8 @@ BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char
cli->rap_error = SVAL(rparam,0);
}
- if (rparam)
- free(rparam);
- if (rdata)
- free(rdata);
+ SAFE_FREE(rparam);
+ SAFE_FREE(rdata);
return (cli->rap_error == 0);
}
@@ -445,8 +437,8 @@ BOOL cli_qpathinfo(struct cli_state *cli, const char *fname,
*mode = SVAL(rdata,l1_attrFile);
}
- if (rdata) free(rdata);
- if (rparam) free(rparam);
+ SAFE_FREE(rdata);
+ SAFE_FREE(rparam);
return True;
}
@@ -515,8 +507,8 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname,
*ino = IVAL(rdata, 64);
}
- if (rdata) free(rdata);
- if (rparam) free(rparam);
+ SAFE_FREE(rdata);
+ SAFE_FREE(rparam);
return True;
}
@@ -587,8 +579,8 @@ BOOL cli_qfileinfo(struct cli_state *cli, int fnum,
*ino = IVAL(rdata, 64);
}
- if (rdata) free(rdata);
- if (rparam) free(rparam);
+ SAFE_FREE(rdata);
+ SAFE_FREE(rparam);
return True;
}
@@ -631,7 +623,7 @@ BOOL cli_qfileinfo_test(struct cli_state *cli, int fnum, int level, char *outdat
memcpy(outdata, rdata, data_len);
- if (rdata) free(rdata);
- if (rparam) free(rparam);
+ SAFE_FREE(rdata);
+ SAFE_FREE(rparam);
return True;
}