[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2] |
Date: |
Wed, 30 Nov 2005 22:37:01 -0500 |
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.11 ccvs/src/client.c:1.433.4.12
--- ccvs/src/client.c:1.433.4.11 Thu Dec 1 01:48:59 2005
+++ ccvs/src/client.c Thu Dec 1 03:37:00 2005
@@ -1428,22 +1428,6 @@
break;
}
- /* The Mode, Mod-time, and Checksum responses should not carry
- over to a subsequent Created (or whatever) response, even
- in the error case. */
- if (stored_mode)
- {
- free (stored_mode);
- stored_mode = NULL;
- }
- stored_modtime_valid = 0;
- stored_checksum_valid = 0;
-
- if (updated_fname)
- {
- free (updated_fname);
- updated_fname = NULL;
- }
return;
}
@@ -1553,12 +1537,27 @@
I hope the above paragraph makes it clear that making this
clearer is not a one-line fix. */
error (0, 0, "move away `%s'; it is in the way", fullname);
+
+ /* The Mode, Mod-time, and Checksum responses should not carry
+ * over to a subsequent Created (or whatever) response, even
+ * in the error case.
+ */
if (updated_fname)
{
cvs_output ("C ", 0);
cvs_output (updated_fname, 0);
cvs_output ("\n", 1);
+ free (updated_fname);
+ updated_fname = NULL;
+ }
+ if (stored_mode)
+ {
+ free (stored_mode);
+ stored_mode = NULL;
}
+ stored_modtime_valid = 0;
+ stored_checksum_valid = 0;
+
failure_exit = true;
return false;
}
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/17
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2],
Derek Robert Price <=