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 2328059d62085eeec2c00608df20fe70d2d49120..45ea064acdb4e6e63f03da07f5d3f4fbbb4b8023 100644 (file)
--- 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 6e13dad5a66c49f726ddd817d13423372d5a0777..839e98fbfa9f3623e7262afca8ffd23049c844b3 100644 (file)
--- 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 aafcf607f9ca03b5b1e1d51837ea7fa9ed240ff0..9573fca3ad1b6d78896cf4207939e933677ff1d9 100644 (file)
--- 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"));