diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-10 22:10:05 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-04-10 22:10:05 +0000 |
| commit | 820064592bf3049921220746051d9139fda68c65 (patch) | |
| tree | 32ab62cb2ad369447df340a28364daa73b9f9ec1 /source/torture | |
| parent | 794f35080f5881f01cba7e9232e5620bf431f8a9 (diff) | |
| download | samba-820064592bf3049921220746051d9139fda68c65.tar.gz | |
r6284: Starting on 3.0.14:
svn merge -r6016:6020 ../samba_3_0/
svn merge -r6034:6036 ../samba_3_0/
svn merge -r6060:6062 ../samba_3_0/
svn merge -r6062:6063 ../samba_3_0/
svn merge -r6110:6116 ../samba_3_0/
svn merge -r6152:6154 ../samba_3_0/
svn merge -r6157:6158 ../samba_3_0/
svn merge -r6163:6164 ../samba_3_0/
svn merge -r6167:6169 ../samba_3_0/
svn merge -r6174:6175 ../samba_3_0/
svn merge -r6175:6176 ../samba_3_0/
svn merge -r6204:6216 ../samba_3_0/
svn merge -r6216:6217 ../samba_3_0/
svn merge -r6232:6234 ../samba_3_0/
svn merge -r6234:6235 ../samba_3_0/
svn merge -r6242:6243 ../samba_3_0/
svn merge -r6255:6256 ../samba_3_0/
svn merge -r6279:6281 ../samba_3_0/
TO view the change log from SAMBA_3_0, run:
for rev in 6020 6036 6062 6063 6116 6154 6158 6164 6169 \
6175 6176 6216 6217 6234 6235 6243 6256 6281; do
svn log -r$rev svn://svnanon.samba.org/samba/branches/SAMBA_3_0
done
Diffstat (limited to 'source/torture')
| -rw-r--r-- | source/torture/t_strstr.c | 5 | ||||
| -rw-r--r-- | source/torture/torture.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/torture/t_strstr.c b/source/torture/t_strstr.c index 25709526fe8..7b928fb26be 100644 --- a/source/torture/t_strstr.c +++ b/source/torture/t_strstr.c @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) int i; int iters = 1; - char *ret; + const char *ret = NULL; /* Needed to initialize character set */ lp_load("/dev/null", True, False, False); @@ -29,6 +29,9 @@ int main(int argc, char *argv[]) ret = strstr_m(argv[1], argv[2]); } + if (ret == NULL) + ret = "(null)"; + printf("%s\n", ret); return 0; diff --git a/source/torture/torture.c b/source/torture/torture.c index 37aefc55acf..b37a30cf2e3 100644 --- a/source/torture/torture.c +++ b/source/torture/torture.c @@ -537,7 +537,7 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2) static BOOL run_readwritetest(int dummy) { static struct cli_state *cli1, *cli2; - BOOL test1, test2; + BOOL test1, test2 = False; if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { return False; |