svn commit: samba r26690 - in branches/SAMBA_4_0: . source/torture

[jelmer at samba.org]

Author: jelmer
Date: 2008-01-07 22:34:46 +0000 (Mon, 07 Jan 2008)
New Revision: 26690

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26690

Log:
torture: Move torture_context_init() to the ui.c, where all functions related to it are.

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/torture.c
   branches/SAMBA_4_0/source/torture/ui.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c	2008-01-07 14:11:29 UTC (rev 26689)
+++ branches/SAMBA_4_0/source/torture/torture.c	2008-01-07 22:34:46 UTC (rev 26690)
@@ -23,9 +23,8 @@
 #include "torture/torture.h"
 #include "build.h"
 #include "lib/util/dlinklist.h"
-#include "auth/credentials/credentials.h"
-#include "lib/cmdline/popt_common.h"
 #include "param/param.h"
+#include "lib/cmdline/popt_common.h"
 
 _PUBLIC_ int torture_numops=10;
 _PUBLIC_ int torture_entries=1000;
@@ -46,22 +45,7 @@
 	return torture_suite_add_suite(torture_root, suite);
 }
 
-struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, 
-					     const struct torture_ui_ops *ui_ops)
-{
-	struct torture_context *torture = talloc_zero(mem_ctx, 
-						      struct torture_context);
-	torture->ui_ops = ui_ops;
-	torture->returncode = true;
-	torture->ev = cli_credentials_get_event_context(cmdline_credentials);
 
-	if (ui_ops->init)
-		ui_ops->init(torture);
-
-	return torture;
-}
-
-
 int torture_init(void)
 {
 	init_module_fn static_init[] = { STATIC_torture_MODULES };

Modified: branches/SAMBA_4_0/source/torture/ui.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ui.c	2008-01-07 14:11:29 UTC (rev 26689)
+++ branches/SAMBA_4_0/source/torture/ui.c	2008-01-07 22:34:46 UTC (rev 26690)
@@ -24,7 +24,24 @@
 #include "lib/util/dlinklist.h"
 #include "param/param.h"
 #include "system/filesys.h"
+#include "auth/credentials/credentials.h"
+#include "lib/cmdline/popt_common.h"
 
+struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, 
+					     const struct torture_ui_ops *ui_ops)
+{
+	struct torture_context *torture = talloc_zero(mem_ctx, 
+						      struct torture_context);
+	torture->ui_ops = ui_ops;
+	torture->returncode = true;
+	torture->ev = cli_credentials_get_event_context(cmdline_credentials);
+
+	if (ui_ops->init)
+		ui_ops->init(torture);
+
+	return torture;
+}
+
 /**
  create a temporary directory.
 */