names, metadata: reduce scope of some vars

diff --git a/metadata.c b/metadata.c
index a07dadba321d4a7da740d835bbf3de0b6ce087f5..26b3257d309068f6d2d80384a007f5f5accff542 100644 (file)
--- a/metadata.c
+++ b/metadata.c
@@ -209,7 +209,6 @@ static int kdbus_meta_append_exe(struct kdbus_meta *meta)
        if (exe_path) {
                char *tmp;
                char *pathname;
-               size_t len;
 
                tmp = (char *) __get_free_page(GFP_TEMPORARY | __GFP_ZERO);
                if (!tmp) {
@@ -219,7 +218,7 @@ static int kdbus_meta_append_exe(struct kdbus_meta *meta)
 
                pathname = d_path(exe_path, tmp, PAGE_SIZE);
                if (!IS_ERR(pathname)) {
-                       len = tmp + PAGE_SIZE - pathname;
+                       size_t len = tmp + PAGE_SIZE - pathname;
                        ret = kdbus_meta_append_data(meta, KDBUS_ITEM_EXE,
                                                     pathname, len);
                }

diff --git a/names.c b/names.c
index 146feaea938cef64a6b368f3ba478a997a3cd8bf..6946dd464847cac3b510db47dac3f4da18fed2d8 100644 (file)
--- a/names.c
+++ b/names.c
@@ -694,7 +694,6 @@ static int kdbus_name_list_all(struct kdbus_conn *conn, u64 flags,
        int ret;
 
        hash_for_each(conn->ep->bus->conn_hash, i, c, hentry) {
-               struct kdbus_name_entry *e;
                bool added = false;
 
                /* skip activators */
@@ -705,6 +704,8 @@ static int kdbus_name_list_all(struct kdbus_conn *conn, u64 flags,
                /* all names the connection owns */
                if (flags & KDBUS_NAME_LIST_NAMES ||
                    c->flags & KDBUS_HELLO_ACTIVATOR) {
+                       struct kdbus_name_entry *e;
+
                        list_for_each_entry(e, &c->names_list, conn_entry) {
                                ret = kdbus_name_list_write(conn, c, &p,
                                                            e, write);