Merge pull request systemd#21800 from keszybz/net-id-debugging

yuwata · web-flow · commit a00fd2a5535d · 2021-12-18T08:35:08.000+09:00
Add more debugging info to udev builtin net_id
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
@@ -80,7 +80,7 @@
     <para><function>sd_journal_next_skip()</function> and
     <function>sd_journal_previous_skip()</function> advance/set back the read pointer by multiple
     entries at once, as specified in the <varname>skip</varname> parameter. The <varname>skip</varname>
-    parameter must be less than or equal to 2147483647 (2^31-1).</para>
+    parameter must be less than or equal to 2147483647 (2³¹-1).</para>
 
     <para>The journal is strictly ordered by reception time, and hence
     advancing to the next entry guarantees that the entry then
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
@@ -71,7 +71,7 @@
     </para>
 
     <para>Log data collected by the journal is primarily text-based but can also include binary data where
-    necessary. Individual fields making up a log record stored in the journal may be up to 2^64-1 bytes in size.</para>
+    necessary. Individual fields making up a log record stored in the journal may be up to 2⁶⁴-1 bytes in size.</para>
 
     <para>The journal service stores log data either persistently below <filename>/var/log/journal</filename> or in a
     volatile way below <filename>/run/log/journal/</filename> (in the latter case it is lost at reboot). By default, log
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
@@ -384,10 +384,10 @@
           numbers, which could either result in an incorrect value of the <varname>ID_NET_NAME_SLOT</varname>
           property or none at all.</para>
 
-          <para>Some firmware and hypervisor implementations report unreasonable high numbers for the onboard
+          <para>Some firmware and hypervisor implementations report unreasonably high numbers for the onboard
           index. To prevent the generation of bogus onbard interface names, index numbers greater than 16381
-          (2^14-1) were ignored. For s390 PCI devices index values up to 65535 (2^16-1) are valid. To account
-          for that, the limit is increased to now 65535.</para>
+          (2¹⁴-1) were ignored. For s390 PCI devices index values up to 65535 (2¹⁶-1) are valid. To account
+          for that, the limit was increased to 65535.</para>
 
           <para>The udev rule <varname>NAME=</varname> replaces <literal>:</literal>,
           <literal>/</literal>, and <literal>%</literal> with an underscore (<literal>_</literal>), and
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
@@ -60,6 +60,10 @@ static inline const char *empty_to_null(const char *p) {
         return isempty(p) ? NULL : p;
 }
 
+static inline const char *empty_to_na(const char *p) {
+        return isempty(p) ? "n/a" : p;
+}
+
 static inline const char *empty_to_dash(const char *str) {
         return isempty(str) ? "-" : str;
 }
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,10 @@ static inline const char empty_to_null(const char p) {`
`60`	`60`	`return isempty(p) ? NULL : p;`
`61`	`61`	`}`
`62`	`62`
	`63`	`+static inline const char empty_to_na(const char p) {`
	`64`	`+ return isempty(p) ? "n/a" : p;`
	`65`	`+}`
	`66`	`+`
`63`	`67`	`static inline const char empty_to_dash(const char str) {`
`64`	`68`	`return isempty(str) ? "-" : str;`
`65`	`69`	`}`