From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 5 Jan 2019 14:31:47 +0000 (+0100)
Subject: lib-auth-client: auth-master - Rename conn->request_counter to conn->id_counter
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51044e299b7de092f4986c1fc65774d4470ac230;p=thirdparty%2Fdovecot%2Fcore.git

lib-auth-client: auth-master - Rename conn->request_counter to conn->id_counter

This is shorter and consistent with lib-master/master-login-auth.
---

diff --git a/src/lib-auth-client/auth-master-private.h b/src/lib-auth-client/auth-master-private.h
index 2328059d62..45ea064acd 100644
--- a/src/lib-auth-client/auth-master-private.h
+++ b/src/lib-auth-client/auth-master-private.h
@@ -23,7 +23,7 @@ struct auth_master_connection {
 	struct ioloop *ioloop, *prev_ioloop;
 	struct timeout *to;
 
-	unsigned int request_counter;
+	unsigned int id_counter;
 
 	bool (*reply_callback)(const char *cmd, const char *const *args,
 			       void *context);
diff --git a/src/lib-auth-client/auth-master-request.c b/src/lib-auth-client/auth-master-request.c
index 6e13dad5a6..839e98fbfa 100644
--- a/src/lib-auth-client/auth-master-request.c
+++ b/src/lib-auth-client/auth-master-request.c
@@ -83,9 +83,9 @@ int auth_master_run_cmd(struct auth_master_connection *conn, const char *cmd)
 
 unsigned int auth_master_next_request_id(struct auth_master_connection *conn)
 {
-	if (++conn->request_counter == 0) {
+	if (++conn->id_counter == 0) {
 		/* avoid zero */
-		conn->request_counter++;
+		conn->id_counter++;
 	}
-	return conn->request_counter;
+	return conn->id_counter;
 }
diff --git a/src/lib-auth-client/auth-master.c b/src/lib-auth-client/auth-master.c
index aafcf607f9..9573fca3ad 100644
--- a/src/lib-auth-client/auth-master.c
+++ b/src/lib-auth-client/auth-master.c
@@ -184,7 +184,7 @@ auth_master_handle_input(struct auth_master_connection *conn,
 		args++;
 	}
 
-	wanted_id = dec2str(conn->request_counter);
+	wanted_id = dec2str(conn->id_counter);
 	if (strcmp(id, wanted_id) == 0) {
 		e_debug(conn->conn.event, "auth input: %s",
 			t_strarray_join(args, "\t"));