diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/journald-native.c | 2 | ||||
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 3 | ||||
| -rw-r--r-- | src/test/test-sizeof.c | 14 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 3c03b83754..c9bf3832c7 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -279,7 +279,7 @@ void server_process_native_message( if (message) { if (s->forward_to_syslog) - server_forward_syslog(s, priority, identifier, message, ucred, tv); + server_forward_syslog(s, syslog_fixup_facility(priority), identifier, message, ucred, tv); if (s->forward_to_kmsg) server_forward_kmsg(s, priority, identifier, message, ucred); diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 9fde9b1884..9828078443 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -389,6 +389,9 @@ static int handle_provides(SysvStub *s, unsigned line, const char *full_text, co r = strv_extend(&s->before, SPECIAL_NETWORK_TARGET); if (r < 0) return log_oom(); + r = strv_extend(&s->wants, SPECIAL_NETWORK_TARGET); + if (r < 0) + return log_oom(); } break; diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 8f99a13772..36389b7710 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -17,7 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "log.h" +#include <stdio.h> + #include "time-util.h" /* Print information about various types. Useful when diagnosing @@ -26,10 +27,10 @@ #pragma GCC diagnostic ignored "-Wtype-limits" #define info(t) \ - log_info("%s → %zu bits%s", STRINGIFY(t), \ - sizeof(t)*CHAR_BIT, \ - strstr(STRINGIFY(t), "signed") ? "" : \ - ((t)-1 < (t)0 ? ", signed" : ", unsigned")); + printf("%s → %zu bits%s\n", STRINGIFY(t), \ + sizeof(t)*CHAR_BIT, \ + strstr(STRINGIFY(t), "signed") ? "" : \ + ((t)-1 < (t)0 ? ", signed" : ", unsigned")); int main(void) { info(char); @@ -39,6 +40,8 @@ int main(void) { info(unsigned); info(long unsigned); info(long long unsigned); + info(__syscall_ulong_t); + info(__syscall_slong_t); info(float); info(double); @@ -48,6 +51,7 @@ int main(void) { info(ssize_t); info(time_t); info(usec_t); + info(__time_t); return 0; } |