morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-json: drop sd_json_dispatch_pid() again, as we prefer json_dispatch_pidref() now

Browse Source 
The calls are now unused, and we generally prefer if people send a PID
triplet rather than a single PID, hence stop supporting a high-level
dispacher for pid_t.
This commit is contained in:
Lennart Poettering
2024-10-11 14:03:05 +02:00
parent 6bca1a7c6c
commit 625f109604
4 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/process-util.h
View File

@@ -150,7 +150,6 @@ static inline bool sched_priority_is_valid(int i) {
}
#define PID_AUTOMATIC ((pid_t) INT_MIN) /* special value indicating "acquire pid from connection peer" */
#define PID_INVALID ((pid_t) 0) /* default value for "invalid pid" */
static inline bool pid_is_valid(pid_t p) {
return p > 0;
@@ -160,10 +159,6 @@ static inline bool pid_is_automatic(pid_t p) {
return p == PID_AUTOMATIC;
}
static inline bool pid_is_valid_or_automatic(pid_t p) {
return pid_is_valid(p) || pid_is_automatic(p);
}
pid_t getpid_cached(void);
void reset_cached_pid(void);

1
src/libsystemd/libsystemd.sym
View File

@@ -864,7 +864,6 @@ global:
sd_json_dispatch_strv;
sd_json_dispatch_tristate;
sd_json_dispatch_uid_gid;
sd_json_dispatch_pid;
sd_json_dispatch_uint16;
sd_json_dispatch_uint32;
sd_json_dispatch_uint64;

38
src/libsystemd/sd-json/sd-json.c
View File

@@ -5564,44 +5564,6 @@ _public_ int sd_json_dispatch_uid_gid(const char *name, sd_json_variant *variant
return 0;
}
_public_ int sd_json_dispatch_pid(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
/* pid_t is a signed type, but we don't consider negative values as valid.
* There is a special treatment for 0 if SD_JSON_RELAX flag present. */
pid_t *pid = userdata;
uint32_t k;
int r;
assert_return(variant, -EINVAL);
assert_cc(sizeof(pid_t) == sizeof(uint32_t));
if (sd_json_variant_is_null(variant)) {
*pid = PID_INVALID;
return 0;
}
r = sd_json_dispatch_uint32(name, variant, flags, &k);
if (r < 0)
return r;
if (k == 0) {
if (!FLAGS_SET(flags, SD_JSON_RELAX))
goto invalid_value;
*pid = PID_AUTOMATIC;
return 0;
}
if (!pid_is_valid(k))
goto invalid_value;
*pid = k;
return 0;
invalid_value:
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a valid PID.", strna(name));
}
_public_ int sd_json_dispatch_id128(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
sd_id128_t *uuid = userdata;
int r;

1
src/systemd/sd-json.h
View File

@@ -328,7 +328,6 @@ int sd_json_dispatch_int8(const char *name, sd_json_variant *variant, sd_json_di
int sd_json_dispatch_uint8(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int sd_json_dispatch_double(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int sd_json_dispatch_uid_gid(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int sd_json_dispatch_pid(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int sd_json_dispatch_id128(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int sd_json_dispatch_signal(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int sd_json_dispatch_unsupported(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);