daemon/session: use common naming convention in the entire file

Rename "s" to "session" to be consistent with all the other
session_*() functions to make it easier to read.

diff --git a/daemon/session.c b/daemon/session.c
index 5e0df70bef9074aefa21d26cf6db26d559ea1d5b..616e851956e71df806eb7d62183584f5a852e938 100644 (file)
--- a/daemon/session.c
+++ b/daemon/session.c
@@ -739,30 +739,30 @@ int session_wirebuf_process(struct session *session, const struct sockaddr *peer
        return ret;
 }
 
-void session_kill_ioreq(struct session *s, struct qr_task *task)
+void session_kill_ioreq(struct session *session, struct qr_task *task)
 {
-       if (!s) {
+       if (!session) {
                return;
        }
-       assert(s->sflags.outgoing && s->handle);
-       if (s->sflags.closing) {
+       assert(session->sflags.outgoing && session->handle);
+       if (session->sflags.closing) {
                return;
        }
-       session_tasklist_del(s, task);
-       if (s->handle->type == UV_UDP) {
-               assert(session_tasklist_is_empty(s));
-               session_close(s);
+       session_tasklist_del(session, task);
+       if (session->handle->type == UV_UDP) {
+               assert(session_tasklist_is_empty(session));
+               session_close(session);
                return;
        }
 }
 
 /** Update timestamp */
-void session_touch(struct session *s)
+void session_touch(struct session *session)
 {
-       s->last_activity = kr_now();
+       session->last_activity = kr_now();
 }
 
-uint64_t session_last_activity(struct session *s)
+uint64_t session_last_activity(struct session *session)
 {
-       return s->last_activity;
+       return session->last_activity;
 }

diff --git a/daemon/session.h b/daemon/session.h
index 0de2b3aa31f2fe6f3d56af677af54ed2d7db4bce..a36eb6134e87e7df90a1e7de5bb1e3045bd76c54 100644 (file)
--- a/daemon/session.h
+++ b/daemon/session.h
@@ -91,7 +91,7 @@ void session_tls_set_server_ctx(struct session *session, struct tls_ctx *ctx);
 struct tls_client_ctx *session_tls_get_client_ctx(const struct session *session);
 /** Set pointer to client-side tls-related data. */
 void session_tls_set_client_ctx(struct session *session, struct tls_client_ctx *ctx);
-/** Get pointer to that part of tls-related data which has common structure for 
+/** Get pointer to that part of tls-related data which has common structure for
  *  server and client. */
 struct tls_common_ctx *session_tls_get_common_ctx(const struct session *session);
 
@@ -131,9 +131,9 @@ void session_unpoison(struct session *session);
 knot_pkt_t *session_produce_packet(struct session *session, knot_mm_t *mm);
 int session_discard_packet(struct session *session, const knot_pkt_t *pkt);
 
-void session_kill_ioreq(struct session *s, struct qr_task *task);
+void session_kill_ioreq(struct session *session, struct qr_task *task);
 /** Update timestamp */
-void session_touch(struct session *s);
+void session_touch(struct session *session);
 /** Returns either creation time or time of last IO activity if any occurs. */
 /* Used for TCP timeout calculation. */
-uint64_t session_last_activity(struct session *s);
+uint64_t session_last_activity(struct session *session);