colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd: merge branch systemd into master

Browse Source
This commit is contained in:
Thomas Haller
2019-01-07 08:47:17 +01:00
parent 6976094603 19a64c09a9
commit 22dc82724c
12 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/systemd/src/basic/fd-util.c
View File

@@ -72,7 +72,7 @@ int safe_close(int fd) {
return -1;
}
void safe_close_pair(int p[]) {
void safe_close_pair(int p[static 2]) {
assert(p);
if (p[0] == p[1]) {

2
shared/systemd/src/basic/fd-util.h
View File

@@ -14,7 +14,7 @@
int close_nointr(int fd);
int safe_close(int fd);
void safe_close_pair(int p[]);
void safe_close_pair(int p[static 2]);
static inline int safe_close_above_stdio(int fd) {
if (fd < 3) /* Don't close stdin/stdout/stderr, but still invalidate the fd by returning -1 */

6
shared/systemd/src/basic/siphash24.h
View File

@@ -45,14 +45,14 @@ siphash24 (const void *in, size_t inlen, const uint8_t k[16])
}
#endif /* NM_IGNORED */
void siphash24_init(struct siphash *state, const uint8_t k[16]);
void siphash24_init(struct siphash *state, const uint8_t k[static 16]);
void siphash24_compress(const void *in, size_t inlen, struct siphash *state);
#define siphash24_compress_byte(byte, state) siphash24_compress((const uint8_t[]) { (byte) }, 1, (state))
uint64_t siphash24_finalize(struct siphash *state);
uint64_t siphash24(const void *in, size_t inlen, const uint8_t k[16]);
uint64_t siphash24(const void *in, size_t inlen, const uint8_t k[static 16]);
static inline uint64_t siphash24_string(const char *s, const uint8_t k[16]) {
static inline uint64_t siphash24_string(const char *s, const uint8_t k[static 16]) {
return siphash24(s, strlen(s) + 1, k);
}

2
shared/systemd/src/basic/string-util.c
View File

@@ -748,7 +748,7 @@ char *strreplace(const char *text, const char *old_string, const char *new_strin
return ret;
}
static void advance_offsets(ssize_t diff, size_t offsets[2], size_t shift[2], size_t size) {
static void advance_offsets(ssize_t diff, size_t offsets[static 2], size_t shift[static 2], size_t size) {
if (!offsets)
return;

3
shared/systemd/src/basic/time-util.c
View File

@@ -26,9 +26,6 @@
#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
#if 0 /* NM_IGNORED */
#include "serialize.h"
#endif /* NM_IGNORED */
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"

2
shared/systemd/src/basic/util.c
View File

@@ -562,7 +562,7 @@ uint64_t system_tasks_max_scale(uint64_t v, uint64_t max) {
}
int version(void) {
puts(PACKAGE_STRING "\n"
puts("systemd " STRINGIFY(PROJECT_VERSION) " (" GIT_VERSION ")\n"
SYSTEMD_FEATURES);
return 0;
}