svn commit: samba r23639 - in branches: SAMBA_3_0/source/lib
SAMBA_3_0_26/source/lib
obnox at samba.org
obnox at samba.org
Wed Jun 27 22:10:26 GMT 2007
Author: obnox
Date: 2007-06-27 22:10:25 +0000 (Wed, 27 Jun 2007)
New Revision: 23639
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23639
Log:
Eliminate trailing whitespaces in the new tdb_validate functions...
Michael
Modified:
branches/SAMBA_3_0/source/lib/util_tdb.c
branches/SAMBA_3_0_26/source/lib/util_tdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_tdb.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_tdb.c 2007-06-27 20:32:35 UTC (rev 23638)
+++ branches/SAMBA_3_0/source/lib/util_tdb.c 2007-06-27 22:10:25 UTC (rev 23639)
@@ -990,7 +990,7 @@
* internal validation function, executed by the child.
*/
static int tdb_validate_child(const char *tdb_path,
- tdb_validate_data_func validate_fn,
+ tdb_validate_data_func validate_fn,
int pfd)
{
int ret = -1;
@@ -998,7 +998,7 @@
int num_entries = 0;
TDB_CONTEXT *tdb = NULL;
struct tdb_validation_status v_status;
-
+
v_status.tdb_error = False;
v_status.bad_freelist = False;
v_status.bad_entry = False;
@@ -1050,7 +1050,7 @@
if (tdb) {
if (ret == 0) {
tdb_close(tdb);
- }
+ }
else if (tfd != -1) {
close(tfd);
}
@@ -1072,10 +1072,10 @@
int pipe_fds[2];
struct tdb_validation_status v_status;
int bytes_read = 0;
-
- /* fork and let the child do the validation.
+
+ /* fork and let the child do the validation.
* benefit: no need to twist signal handlers and panic functions.
- * just let the child panic. we catch the signal.
+ * just let the child panic. we catch the signal.
* communicate the extended status struct over a pipe. */
if (pipe(pipe_fds) != 0) {
@@ -1099,7 +1099,7 @@
/* parent */
- DEBUG(10, ("tdb_validate: fork succeeded, child PID = %d\n",
+ DEBUG(10, ("tdb_validate: fork succeeded, child PID = %d\n",
child_pid));
close(pipe_fds[1]); /* close writing fd */
@@ -1151,7 +1151,6 @@
"unexpected PID.");
}
-
DEBUG(10, ("tdb_validate: validating child returned.\n"));
if (WIFEXITED(child_status)) {
DEBUG(10, ("tdb_validate: child exited, code %d.\n",
Modified: branches/SAMBA_3_0_26/source/lib/util_tdb.c
===================================================================
--- branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-06-27 20:32:35 UTC (rev 23638)
+++ branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-06-27 22:10:25 UTC (rev 23639)
@@ -990,7 +990,7 @@
* internal validation function, executed by the child.
*/
static int tdb_validate_child(const char *tdb_path,
- tdb_validate_data_func validate_fn,
+ tdb_validate_data_func validate_fn,
int pfd)
{
int ret = -1;
@@ -998,7 +998,7 @@
int num_entries = 0;
TDB_CONTEXT *tdb = NULL;
struct tdb_validation_status v_status;
-
+
v_status.tdb_error = False;
v_status.bad_freelist = False;
v_status.bad_entry = False;
@@ -1050,7 +1050,7 @@
if (tdb) {
if (ret == 0) {
tdb_close(tdb);
- }
+ }
else if (tfd != -1) {
close(tfd);
}
@@ -1072,10 +1072,10 @@
int pipe_fds[2];
struct tdb_validation_status v_status;
int bytes_read = 0;
-
- /* fork and let the child do the validation.
+
+ /* fork and let the child do the validation.
* benefit: no need to twist signal handlers and panic functions.
- * just let the child panic. we catch the signal.
+ * just let the child panic. we catch the signal.
* communicate the extended status struct over a pipe. */
if (pipe(pipe_fds) != 0) {
@@ -1099,7 +1099,7 @@
/* parent */
- DEBUG(10, ("tdb_validate: fork succeeded, child PID = %d\n",
+ DEBUG(10, ("tdb_validate: fork succeeded, child PID = %d\n",
child_pid));
close(pipe_fds[1]); /* close writing fd */
@@ -1151,7 +1151,6 @@
"unexpected PID.");
}
-
DEBUG(10, ("tdb_validate: validating child returned.\n"));
if (WIFEXITED(child_status)) {
DEBUG(10, ("tdb_validate: child exited, code %d.\n",
More information about the samba-cvs
mailing list