summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-09-04 11:04:16 +0200
committerAndrew Bartlett <abartlet@samba.org>2012-09-04 20:16:48 +1000
commit8d3e193fa153eb0c219953707db5ac4cb93cc853 (patch)
tree97188e6942ba6faf4ca7223c978987965b2d40be
parent2c9c58993cf36bc959d3bf1ca634fbaf9bb3a08f (diff)
downloadsamba-8d3e193fa153eb0c219953707db5ac4cb93cc853.tar.gz
samba-8d3e193fa153eb0c219953707db5ac4cb93cc853.tar.bz2
samba-8d3e193fa153eb0c219953707db5ac4cb93cc853.zip
file_server: use 'subreq' as variable instead of 'req'
This matches the style of all other tevent_req users. metze
-rw-r--r--file_server/file_server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/file_server/file_server.c b/file_server/file_server.c
index e1560c202d..7c8517e46f 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -96,7 +96,7 @@ static void file_server_smbd_done(struct tevent_req *subreq)
static void s3fs_task_init(struct task_server *task)
{
const char *fileserver_conf;
- struct tevent_req *req;
+ struct tevent_req *subreq;
const char *smbd_path;
const char *smbd_cmd[2] = { NULL, NULL };
@@ -109,19 +109,19 @@ static void s3fs_task_init(struct task_server *task)
smbd_cmd[0] = smbd_path;
/* start it as a child process */
- req = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
+ subreq = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
smbd_cmd,
"--configfile", fileserver_conf,
"--foreground",
debug_get_output_is_stdout()?"--log-stdout":NULL,
NULL);
- if (req == NULL) {
+ if (subreq == NULL) {
DEBUG(0, ("Failed to start smbd as child daemon\n"));
task_server_terminate(task, "Failed to startup s3fs smb task", true);
return;
}
- tevent_req_set_callback(req, file_server_smbd_done, task);
+ tevent_req_set_callback(subreq, file_server_smbd_done, task);
DEBUG(1,("Started file server smbd with config %s\n", fileserver_conf));
}