From 627ef37a775fed0bc67a4d79c26335990f6f09f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Sun, 25 Jul 2021 02:12:07 +0200
Subject: [PATCH] pulse-server: use `pid_t` where appropriate

Instead of `int`, use the `pid_t` type to represent
process identifiers.
---
 src/modules/module-protocol-pulse/server.c | 3 ++-
 src/modules/module-protocol-pulse/utils.c  | 6 +++---
 src/modules/module-protocol-pulse/utils.h  | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/module-protocol-pulse/server.c b/src/modules/module-protocol-pulse/server.c
index 6d849f512..813930fdd 100644
--- a/src/modules/module-protocol-pulse/server.c
+++ b/src/modules/module-protocol-pulse/server.c
@@ -353,8 +353,9 @@ on_connect(void *data, int fd, uint32_t mask)
 	struct impl * const impl = server->impl;
 	struct sockaddr_storage name;
 	socklen_t length;
-	int client_fd, val, pid;
+	int client_fd, val;
 	struct client *client = NULL;
+	pid_t pid;
 
 	length = sizeof(name);
 	client_fd = accept4(fd, (struct sockaddr *) &name, &length, SOCK_CLOEXEC);
diff --git a/src/modules/module-protocol-pulse/utils.c b/src/modules/module-protocol-pulse/utils.c
index 844613a33..033ed096f 100644
--- a/src/modules/module-protocol-pulse/utils.c
+++ b/src/modules/module-protocol-pulse/utils.c
@@ -101,13 +101,13 @@ int get_runtime_dir(char *buf, size_t buflen, const char *dir)
 	return 0;
 }
 
-int check_flatpak(struct client *client, int pid)
+int check_flatpak(struct client *client, pid_t pid)
 {
 	char root_path[2048];
 	int root_fd, info_fd, res;
 	struct stat stat_buf;
 
-	sprintf(root_path, "/proc/%u/root", pid);
+	sprintf(root_path, "/proc/%ld/root", (long) pid);
 	root_fd = openat(AT_FDCWD, root_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
 	if (root_fd == -1) {
 		res = -errno;
@@ -147,7 +147,7 @@ int check_flatpak(struct client *client, int pid)
 	return 1;
 }
 
-int get_client_pid(struct client *client, int client_fd)
+pid_t get_client_pid(struct client *client, int client_fd)
 {
 	socklen_t len;
 #if defined(__linux__)
diff --git a/src/modules/module-protocol-pulse/utils.h b/src/modules/module-protocol-pulse/utils.h
index 77a59d282..488951f9f 100644
--- a/src/modules/module-protocol-pulse/utils.h
+++ b/src/modules/module-protocol-pulse/utils.h
@@ -26,13 +26,14 @@
 #define PULSE_SERVER_UTILS_H
 
 #include <stddef.h>
+#include <sys/types.h>
 
 struct client;
 struct pw_context;
 
 int get_runtime_dir(char *buf, size_t buflen, const char *dir);
-int check_flatpak(struct client *client, int pid);
-int get_client_pid(struct client *client, int client_fd);
+int check_flatpak(struct client *client, pid_t pid);
+pid_t get_client_pid(struct client *client, int client_fd);
 const char *get_server_name(struct pw_context *context);
 int create_pid_file(void);