From e503019bc71c33495ddd7e4270c73f1f0a366834 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 14 Jun 2023 10:13:08 +0200 Subject: [PATCH] tree-wide: when in doubt use greek small letter mu rather than micro symbol Doesn't really matter since the two unicode symbols are supposedly equivalent, but let's better follow the unicode recommendations to prefer greek small letter mu, as per: https://www.unicode.org/reports/tr25 --- catalog/systemd.catalog.in | 2 +- man/kernel-command-line.xml | 2 +- man/org.freedesktop.systemd1.xml | 2 +- man/sd_bus_get_fd.xml | 2 +- man/sd_bus_wait.xml | 2 +- man/sd_event_add_time.xml | 16 ++++++++-------- man/sd_event_now.xml | 2 +- man/sd_login_monitor_new.xml | 2 +- man/sd_notify.xml | 2 +- man/sd_watchdog_enabled.xml | 4 ++-- man/systemctl.xml | 4 ++-- man/systemd-coredump.xml | 2 +- man/systemd.resource-control.xml | 2 +- man/systemd.service.xml | 2 +- man/systemd.socket.xml | 2 +- man/systemd.time.xml | 2 +- man/sysupdate.d.xml | 2 +- src/basic/procfs-util.c | 2 +- src/basic/time-util.c | 2 +- src/coredump/coredump.c | 4 ++-- src/journal-remote/journal-remote-main.c | 6 +++--- src/journal-remote/journal-remote.c | 2 +- src/journal-remote/microhttpd-util.h | 10 +++++----- src/libsystemd/sd-netlink/sd-netlink.c | 4 ++-- src/login/logind-dbus.c | 2 +- src/shared/calendarspec.c | 2 +- src/shared/efi-loader.c | 2 +- src/systemd/sd-daemon.h | 4 ++-- src/test/test-env-file.c | 4 ++-- src/test/test-id128.c | 2 +- src/test/test-process-util.c | 4 ++-- src/timesync/timesyncd.c | 6 +++--- 32 files changed, 54 insertions(+), 54 deletions(-) diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index d3d03dafe7..913d4987ac 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -563,4 +563,4 @@ resources back to the OS kernel, making them available for other components of the OS. @TRIMMED_BYTES@ of memory were returned to the OS, which took @TRIMMED_USEC@ -micro-seconds (µs). +micro-seconds (μs). diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 479b482a30..eef6db4a5c 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -556,7 +556,7 @@ systemd.clock-usec= - Takes a decimal, numeric timestamp in µs since January 1st 1970, 00:00am, to set the + Takes a decimal, numeric timestamp in μs since January 1st 1970, 00:00am, to set the system clock to. The system time is set to the specified timestamp early during boot. It is not propagated to the hardware clock (RTC). diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index fc9a79d796..67ccf5f803 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -37,7 +37,7 @@ unit and job objects or directly convert a unit name or job identifier to a bus path of the corresponding D-Bus object. - Properties exposing time values are usually encoded in microseconds (µs) on the bus, even if + Properties exposing time values are usually encoded in microseconds (μs) on the bus, even if their corresponding settings in the unit files are in seconds. PID 1 uses polkit to diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml index a738f85bde..114b920c6c 100644 --- a/man/sd_bus_get_fd.xml +++ b/man/sd_bus_get_fd.xml @@ -66,7 +66,7 @@ POLLIN, POLLOUT, … events, or negative on error. - sd_bus_get_timeout() returns the absolute time-out in µs, + sd_bus_get_timeout() returns the absolute time-out in μs, from which the relative time-out to pass to poll() (or a similar call) can be derived, when waiting for events on the specified bus connection. The returned timeout may be zero, in which case a subsequent I/O polling call should be invoked in non-blocking mode. The returned timeout may diff --git a/man/sd_bus_wait.xml b/man/sd_bus_wait.xml index eaad91f52e..3c24a6f0a9 100644 --- a/man/sd_bus_wait.xml +++ b/man/sd_bus_wait.xml @@ -47,7 +47,7 @@ indicating that no work is pending on the connection. Internally, this call invokes ppoll2, to wait for I/O on the bus connection. If the timeout_usec parameter is specified, the call will block at most - for the specified amount of time in µs. Pass UINT64_MAX to permit it to sleep + for the specified amount of time in μs. Pass UINT64_MAX to permit it to sleep indefinitely. After each invocation of sd_bus_wait() the sd_bus_process() call diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml index 6031fee1b3..864cf9b268 100644 --- a/man/sd_event_add_time.xml +++ b/man/sd_event_add_time.xml @@ -113,14 +113,14 @@ CLOCK_REALTIME_ALARM, or CLOCK_BOOTTIME_ALARM. See timerfd_create2 for details regarding the various types of clocks. The usec parameter specifies the earliest time, in - microseconds (µs), relative to the clock's epoch, when the timer shall be triggered. If a time already in the past + microseconds (μs), relative to the clock's epoch, when the timer shall be triggered. If a time already in the past is specified (including 0), this timer source "fires" immediately and is ready to be dispatched. If the parameter is specified as UINT64_MAX the timer event will never elapse, which may be used as an alternative to explicitly disabling a timer event source with sd_event_source_set_enabled3. The - accuracy parameter specifies an additional accuracy value in µs specifying how much the - timer event may be delayed. Use 0 to select the default accuracy (250ms). Use 1µs for maximum - accuracy. Consider specifying 60000000µs (1min) or larger for long-running events that may be delayed + accuracy parameter specifies an additional accuracy value in μs specifying how much the + timer event may be delayed. Use 0 to select the default accuracy (250ms). Use 1μs for maximum + accuracy. Consider specifying 60000000μs (1min) or larger for long-running events that may be delayed substantially. Picking higher accuracy values allows the system to coalesce timer events more aggressively, improving power efficiency. @@ -203,14 +203,14 @@ sd_event_source_get_time() retrieves the configured time value of an event source created previously with sd_event_add_time() or sd_event_add_time_relative(). It takes the event source object and a pointer to a - variable to store the time in, relative to the selected clock's epoch, in µs. The returned value is + variable to store the time in, relative to the selected clock's epoch, in μs. The returned value is relative to the epoch, even if the event source was created with a relative time via sd_event_add_time_relative(). sd_event_source_set_time() changes the time of an event source created previously with sd_event_add_time() or sd_event_add_time_relative(). It takes the event source object and a time relative - to the selected clock's epoch, in µs. + to the selected clock's epoch, in μs. sd_event_source_set_time_relative() is similar to sd_event_source_set_time(), but takes a time relative to the current time of the @@ -220,12 +220,12 @@ retrieves the configured accuracy value of an event source created previously with sd_event_add_time(). It takes the event source object and a pointer to a variable to store - the accuracy in. The accuracy is specified in µs. + the accuracy in. The accuracy is specified in μs. sd_event_source_set_time_accuracy() changes the configured accuracy of a timer event source created previously with sd_event_add_time(). It takes - the event source object and accuracy, in µs. + the event source object and accuracy, in μs. sd_event_source_get_time_clock() retrieves the configured clock of an event source created diff --git a/man/sd_event_now.xml b/man/sd_event_now.xml index 70e980ab7b..45037d13b2 100644 --- a/man/sd_event_now.xml +++ b/man/sd_event_now.xml @@ -53,7 +53,7 @@ clock_gettime2 for more information on the various clocks. The retrieved timestamp is stored in the usec parameter, - in µs since the clock's epoch. If this function is invoked before + in μs since the clock's epoch. If this function is invoked before the first event loop iteration, the current time is returned, as reported by clock_gettime(). To distinguish this case from a regular invocation the return value will be diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml index 8118121281..3fbda1c93e 100644 --- a/man/sd_login_monitor_new.xml +++ b/man/sd_login_monitor_new.xml @@ -168,7 +168,7 @@ is no timeout to wait for this will fill in (uint64_t) -1 instead. Note that poll() takes a relative timeout in milliseconds rather than an absolute timeout - in microseconds. To convert the absolute 'µs' timeout into + in microseconds. To convert the absolute 'μs' timeout into relative 'ms', use code like the following: uint64_t t; diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 89f1729b13..a286beaf45 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -140,7 +140,7 @@ MONOTONIC_USEC=… A field carrying the monotonic timestamp (as per - CLOCK_MONOTONIC) formatted in decimal in µs, when the notification message was + CLOCK_MONOTONIC) formatted in decimal in μs, when the notification message was generated by the client. This is typically used in combination with RELOADING=1, to allow the service manager to properly synchronize reload cycles. See systemd.service5 diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml index b4a59f2ad1..352b3606d7 100644 --- a/man/sd_watchdog_enabled.xml +++ b/man/sd_watchdog_enabled.xml @@ -65,7 +65,7 @@ If the usec parameter is non-NULL, sd_watchdog_enabled() will write the timeout - in µs for the watchdog logic to it. + in μs for the watchdog logic to it. To enable service supervision with the watchdog logic, use WatchdogSec= in service files. See @@ -122,7 +122,7 @@ Set by the system manager for supervised process for which watchdog support is enabled, and contains - the watchdog timeout in µs. See above for + the watchdog timeout in μs. See above for details. diff --git a/man/systemctl.xml b/man/systemctl.xml index 537d0aa157..2d2434bbd0 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -2464,7 +2464,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err - + Day YYYY-MM-DD HH:MM:SS.UUUUUU TZ @@ -2479,7 +2479,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err - + Day YYYY-MM-DD HH:MM:SS.UUUUUU UTC diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml index c92a250ca2..4c98c6771a 100644 --- a/man/systemd-coredump.xml +++ b/man/systemd-coredump.xml @@ -192,7 +192,7 @@ COREDUMP_FILENAME=/var/lib/systemd/coredump/core.Web….552351.….zst COREDUMP_TIMESTAMP= - The time of the crash as reported by the kernel (in µs since the epoch). + The time of the crash as reported by the kernel (in μs since the epoch). diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 610c11feb3..7836834efe 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -1362,7 +1362,7 @@ DeviceAllow=/dev/loop-control DefaultMemoryPressureThresholdSec= setting in systemd-system.conf5 (which in turn defaults to 200ms). The specified value expects a time unit such as - ms or µs, see + ms or μs, see systemd.time7 for details on the permitted syntax. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 646e1f21f0..a183a9eedf 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -236,7 +236,7 @@ MONOTONIC_USEC= set to the current monotonic time (i.e. CLOCK_MONOTONIC in clock_gettime2) - in µs, formatted as decimal string. Once reloading is complete another notification message must + in μs, formatted as decimal string. Once reloading is complete another notification message must be sent, containing READY=1. Using this service type and implementing this reload protocol is an efficient alternative to providing an ExecReload= command for reloading of the service's configuration. diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index ec145c3710..7716e2898c 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -715,7 +715,7 @@ Timestamping= Takes one of off, us (alias: - usec, µs) or ns (alias: + usec, μs) or ns (alias: nsec). This controls the SO_TIMESTAMP or SO_TIMESTAMPNS socket options, and enables whether ingress network traffic shall carry timestamping metadata. Defaults to . diff --git a/man/systemd.time.xml b/man/systemd.time.xml index 07100b12b7..6888f2226f 100644 --- a/man/systemd.time.xml +++ b/man/systemd.time.xml @@ -47,7 +47,7 @@ understood: - usec, us, µs + usec, us, μs msec, ms seconds, second, sec, s minutes, minute, min, m diff --git a/man/sysupdate.d.xml b/man/sysupdate.d.xml index 260c260f98..1987e649ae 100644 --- a/man/sysupdate.d.xml +++ b/man/sysupdate.d.xml @@ -375,7 +375,7 @@ @t File modification time - Formatted decimal integer, µs since UNIX epoch Jan 1st 1970 + Formatted decimal integer, μs since UNIX epoch Jan 1st 1970 Only relevant if target resource type chosen as regular-file diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c index bcba5a5208..d7cfcd9105 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -165,7 +165,7 @@ int procfs_cpu_get_usage(nsec_t *ret) { (uint64_t) irq_ticks + (uint64_t) softirq_ticks + (uint64_t) guest_ticks + (uint64_t) guest_nice_ticks; - /* Let's reduce this fraction before we apply it to avoid overflows when converting this to µsec */ + /* Let's reduce this fraction before we apply it to avoid overflows when converting this to μsec */ gcd = calc_gcd64(NSEC_PER_SEC, ticks_per_second); a = (uint64_t) NSEC_PER_SEC / gcd; diff --git a/src/basic/time-util.c b/src/basic/time-util.c index 0ab2a81059..b3ade93122 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -327,7 +327,7 @@ char *format_timestamp_style( if (l < (size_t) (1 + 1 + 1)) return NULL; /* not enough space for even the shortest of forms */ - return snprintf_ok(buf, l, "@" USEC_FMT, t / USEC_PER_SEC); /* round down µs → s */ + return snprintf_ok(buf, l, "@" USEC_FMT, t / USEC_PER_SEC); /* round down μs → s */ } utc = IN_SET(style, TIMESTAMP_UTC, TIMESTAMP_US_UTC, TIMESTAMP_DATE); diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 0fe19894e5..847ac531df 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -91,7 +91,7 @@ enum { META_ARGV_UID, /* %u: as seen in the initial user namespace */ META_ARGV_GID, /* %g: as seen in the initial user namespace */ META_ARGV_SIGNAL, /* %s: number of signal causing dump */ - META_ARGV_TIMESTAMP, /* %t: time of dump, expressed as seconds since the Epoch (we expand this to µs granularity) */ + META_ARGV_TIMESTAMP, /* %t: time of dump, expressed as seconds since the Epoch (we expand this to μs granularity) */ META_ARGV_RLIMIT, /* %c: core file size soft resource limit */ META_ARGV_HOSTNAME, /* %h: hostname */ _META_ARGV_MAX, @@ -1205,7 +1205,7 @@ static int gather_pid_metadata_from_argv( case META_ARGV_TIMESTAMP: /* The journal fields contain the timestamp padded with six * zeroes, so that the kernel-supplied 1s granularity timestamps - * becomes 1µs granularity, i.e. the granularity systemd usually + * becomes 1μs granularity, i.e. the granularity systemd usually * operates in. */ t = free_timestamp = strjoin(argv[i], "000000"); if (!t) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index c5ecc2b844..db94644ceb 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -436,7 +436,7 @@ static int setup_microhttpd_server(RemoteServer *s, MHD_OPTION_ARRAY, opts, MHD_OPTION_END); if (!d->daemon) { - log_error("Failed to start µhttp daemon"); + log_error("Failed to start μhttp daemon"); r = -EINVAL; goto error; } @@ -446,14 +446,14 @@ static int setup_microhttpd_server(RemoteServer *s, info = MHD_get_daemon_info(d->daemon, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY); if (!info) { - log_error("µhttp returned NULL daemon info"); + log_error("μhttp returned NULL daemon info"); r = -EOPNOTSUPP; goto error; } epoll_fd = info->listen_fd; if (epoll_fd < 0) { - log_error("µhttp epoll fd is invalid"); + log_error("μhttp epoll fd is invalid"); r = -EUCLEAN; goto error; } diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 6e993863bf..8b64bc78e9 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -149,7 +149,7 @@ int journal_remote_get_writer(RemoteServer *s, const char *host, Writer **writer ********************************************************************** **********************************************************************/ -/* This should go away as soon as µhttpd allows state to be passed around. */ +/* This should go away as soon as μhttpd allows state to be passed around. */ RemoteServer *journal_remote_server_global; static int dispatch_raw_source_event(sd_event_source *event, diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h index df18335469..140e7f6223 100644 --- a/src/journal-remote/microhttpd-util.h +++ b/src/journal-remote/microhttpd-util.h @@ -11,22 +11,22 @@ * enum elements with the same name. Hence let's check for the *old* name, * and define the new name by the value of the old name. */ -/* Renamed in µhttpd 0.9.51 */ +/* Renamed in μhttpd 0.9.51 */ #ifndef MHD_USE_PIPE_FOR_SHUTDOWN # define MHD_USE_ITC MHD_USE_PIPE_FOR_SHUTDOWN #endif -/* Renamed in µhttpd 0.9.52 */ +/* Renamed in μhttpd 0.9.52 */ #ifndef MHD_USE_EPOLL_LINUX_ONLY # define MHD_USE_EPOLL MHD_USE_EPOLL_LINUX_ONLY #endif -/* Renamed in µhttpd 0.9.52 */ +/* Renamed in μhttpd 0.9.52 */ #ifndef MHD_USE_SSL # define MHD_USE_TLS MHD_USE_SSL #endif -/* Renamed in µhttpd 0.9.53 */ +/* Renamed in μhttpd 0.9.53 */ #ifndef MHD_USE_POLL_INTERNALLY # define MHD_USE_POLL_INTERNAL_THREAD MHD_USE_POLL_INTERNALLY #endif @@ -38,7 +38,7 @@ # define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE #endif -/* Renamed in µhttpd 0.9.74 (8c644fc1f4d498ea489add8d40a68f5d3e5899fa) */ +/* Renamed in μhttpd 0.9.74 (8c644fc1f4d498ea489add8d40a68f5d3e5899fa) */ #ifndef MHD_HTTP_CONTENT_TOO_LARGE # ifdef MHD_HTTP_PAYLOAD_TOO_LARGE # define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_PAYLOAD_TOO_LARGE /* 0.9.53 or newer */ diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index 132f63e57d..9d1df72381 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -45,13 +45,13 @@ static int netlink_new(sd_netlink **ret) { * while the socket sticks around we might get confused by replies from earlier runs coming * in late — which is pretty likely if we'd start our sequence numbers always from 1. Hence, * let's start with a value based on the system clock. This should make collisions much less - * likely (though still theoretically possible). We use a 32 bit µs counter starting at boot + * likely (though still theoretically possible). We use a 32 bit μs counter starting at boot * for this (and explicitly exclude the zero, see above). This counter will wrap around after * a bit more than 1h, but that's hopefully OK as the kernel shouldn't take that long to * reply to our requests. * * We only pick the initial start value this way. For each message we simply increase the - * sequence number by 1. This means we could enqueue 1 netlink message per µs without risking + * sequence number by 1. This means we could enqueue 1 netlink message per μs without risking * collisions, which should be OK. * * Note this means the serials will be in the range 1…UINT32_MAX here. diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index e1e9b723c8..79531d2cc4 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2871,7 +2871,7 @@ static int method_set_reboot_to_boot_loader_menu( } else { char buf[DECIMAL_STR_MAX(uint64_t) + 1]; - xsprintf(buf, "%" PRIu64, x); /* µs granularity */ + xsprintf(buf, "%" PRIu64, x); /* μs granularity */ r = write_string_file_atomic_label("/run/systemd/reboot-to-boot-loader-menu", buf); if (r < 0) diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c index f17d97a2c1..2665930209 100644 --- a/src/shared/calendarspec.c +++ b/src/shared/calendarspec.c @@ -649,7 +649,7 @@ static int prepend_component(const char **p, bool usec, unsigned nesting, Calend if (repeat == 0) return -ERANGE; } else { - /* If no repeat value is specified for the µs component, then let's explicitly refuse ranges + /* If no repeat value is specified for the μs component, then let's explicitly refuse ranges * below 1s because our default repeat granularity is beyond that. */ /* Overflow check */ diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c index f77f8351cf..e3ec91b877 100644 --- a/src/shared/efi-loader.c +++ b/src/shared/efi-loader.c @@ -309,7 +309,7 @@ int efi_loader_get_config_timeout_one_shot(usec_t *ret) { return -ERANGE; cache_stat = new_stat; - *ret = cache = sec * USEC_PER_SEC; /* return in µs */ + *ret = cache = sec * USEC_PER_SEC; /* return in μs */ return 0; } diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index 2d095f72df..595b6f3374 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -298,7 +298,7 @@ int sd_pid_notifyf_with_fds(pid_t pid, int unset_environment, const int *fds, si /* Returns > 0 if synchronization with systemd succeeded. Returns < 0 on error. Returns 0 if $NOTIFY_SOCKET was not set. Note that the - timeout parameter of this function call takes the timeout in µs, and + timeout parameter of this function call takes the timeout in μs, and will be passed to ppoll(2), hence the behaviour will be similar to ppoll(2). This function can be called after sending a status message to systemd, if one needs to synchronize against reception of the @@ -330,7 +330,7 @@ int sd_booted(void); Returns > 0 if the service manager expects watchdog keep-alive events to be sent regularly via sd_notify(0, "WATCHDOG=1"). Returns 0 if it does not expect this. If the usec argument is non-NULL - returns the watchdog timeout in µs after which the service manager + returns the watchdog timeout in μs after which the service manager will act on a process that has not sent a watchdog keep alive message. This function is useful to implement services that recognize automatically if they are being run under supervision of diff --git a/src/test/test-env-file.c b/src/test/test-env-file.c index c8ec0e2278..cc20031ed7 100644 --- a/src/test/test-env-file.c +++ b/src/test/test-env-file.c @@ -22,7 +22,7 @@ "e \\\n" \ "f \n" \ "g=g\\ \n" \ - "h= ąęół\\ śćńźżµ \n" \ + "h= ąęół\\ śćńźżμ \n" \ "i=i\\" #define env_file_2 \ @@ -68,7 +68,7 @@ TEST(load_env_file_1) { assert_se(streq(data[1], "b=bc")); assert_se(streq(data[2], "d=de f")); assert_se(streq(data[3], "g=g ")); - assert_se(streq(data[4], "h=ąęół śćńźżµ")); + assert_se(streq(data[4], "h=ąęół śćńźżμ")); assert_se(streq(data[5], "i=i")); assert_se(data[6] == NULL); } diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 80f762bc89..4a39d06ef8 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -214,7 +214,7 @@ TEST(benchmark_sd_id128_get_machine_app_specific) { q = now(CLOCK_MONOTONIC) - t; - log_info("%lf µs each\n", (double) q / iterations); + log_info("%lf μs each\n", (double) q / iterations); } TEST(id128_at) { diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index b90b892192..e915207e8c 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -614,7 +614,7 @@ TEST(getpid_measure) { (void) getpid(); q = now(CLOCK_MONOTONIC) - t; - log_info(" glibc getpid(): %lf µs each\n", (double) q / iterations); + log_info(" glibc getpid(): %lf μs each\n", (double) q / iterations); iterations *= 50; /* _cached() is about 50 times faster, so we need more iterations */ @@ -623,7 +623,7 @@ TEST(getpid_measure) { (void) getpid_cached(); q = now(CLOCK_MONOTONIC) - t; - log_info("getpid_cached(): %lf µs each\n", (double) q / iterations); + log_info("getpid_cached(): %lf μs each\n", (double) q / iterations); } TEST(safe_fork) { diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index 416b536aed..1d8ebecc91 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -32,15 +32,15 @@ static int advance_tstamp(int fd, const struct stat *st) { * different timestamp accuracy: traditional fat has 2s granularity, and even ext2 and friends expose * different granularity depending on selected inode size during formatting! Hence, to ensure the * timestamp definitely is increased, here's what we'll do: we'll first try to increase the timestamp - * by 1µs, write that and read it back. If it was updated, great. But if it was not, we'll instead - * increase the timestamp by 10µs, and do the same, then 100µs, then 1ms, and so on, until it works, + * by 1μs, write that and read it back. If it was updated, great. But if it was not, we'll instead + * increase the timestamp by 10μs, and do the same, then 100μs, then 1ms, and so on, until it works, * or we reach 10s. If it still didn't work then, the fs is just broken and we give up. */ usec_t target = MAX3(now(CLOCK_REALTIME), TIME_EPOCH * USEC_PER_SEC, timespec_load(&st->st_mtim)); - for (usec_t a = 1; a <= 10 * USEC_PER_SEC; a *= 10) { /* 1µs, 10µs, 100µs, 1ms, … 10s */ + for (usec_t a = 1; a <= 10 * USEC_PER_SEC; a *= 10) { /* 1μs, 10μs, 100μs, 1ms, … 10s */ struct timespec ts[2]; struct stat new_st;