parse-util: rename trivial argument for parse_pid()

The function parse_pid() trivially returns pid, hence it is not
necessary to name the argument for storing result as 'ret_pid'.

(cherry picked from commit dd839b1463e7ead1d16048cf4e32b0efb1b0774f)
(cherry picked from commit adc0290a9d8874ce7fc7f924b4150c7b53d8c483)
(cherry picked from commit 89738c01af77839f882b87e0e5d8a5f43cfe013f)

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index faa5344921c40f69ce9e045cb6011355d433aa7b..449a59002bce0766085b93ffa152a0e967b3696b 100644 (file)
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -63,7 +63,7 @@ int parse_tristate_full(const char *v, const char *third, int *ret) {
         return 0;
 }
 
-int parse_pid(const char *s, pid_t* ret_pid) {
+int parse_pid(const char *s, pid_t *ret) {
         unsigned long ul = 0;
         pid_t pid;
         int r;
@@ -82,8 +82,8 @@ int parse_pid(const char *s, pid_t* ret_pid) {
         if (!pid_is_valid(pid))
                 return -ERANGE;
 
-        if (ret_pid)
-                *ret_pid = pid;
+        if (ret)
+                *ret = pid;
         return 0;
 }
 

diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index a47c8c7935b32d8e9cef09498ee2c0620e21041d..3081618beff3e32a8f3953d82be017956ce80ebf 100644 (file)
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -16,7 +16,7 @@ int parse_tristate_full(const char *v, const char *third, int *ret);
 static inline int parse_tristate(const char *v, int *ret) {
         return parse_tristate_full(v, NULL, ret);
 }
-int parse_pid(const char *s, pid_t* ret_pid);
+int parse_pid(const char *s, pid_t *ret);
 int parse_mode(const char *s, mode_t *ret);
 int parse_ifindex(const char *s);
 int parse_mtu(int family, const char *s, uint32_t *ret);