summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-08-27 17:00:35 +0200
committerThomas Haller <thaller@redhat.com>2020-08-27 17:10:55 +0200
commit818d146d88e700569963a31838917ba8ec88bd00 (patch)
tree0547e9b063d6cc2f32c466894a421089e5d48366
parentbc4c81fb43ef8bbcb851c804935ae4f4634050e9 (diff)
downloadNetworkManager-818d146d88e700569963a31838917ba8ec88bd00.tar.gz
core/trivial: replace "XXX" markers with "TODO"
"XXX" is used for tagging parts of code that still need work before merging a patch. If you want to highlight/mark a comment which is merged use either "TODO" or "FIXME". Of course, even "TODO" and "FIXME" should be avoided in favor of just doing/fixing it. Such things tend to never be done/fixed.
-rw-r--r--po/zh_CN.po4
-rw-r--r--src/devices/ovs/nm-ovsdb.c2
-rw-r--r--src/nm-policy.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-14
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected6
5 files changed, 9 insertions, 9 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fddbc271f1..d1e716ddde 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3431,8 +3431,8 @@ msgstr "NetworkManaer 未运行。"
msgid "NetworkManager permissions"
msgstr "网络管理器权限"
-# XXX: 这里考虑一下要不要翻译
-# XXX: Should we translate this?
+# Question: 这里考虑一下要不要翻译
+# Question: Should we translate this?
#: ../clients/cli/general.c:567
#, c-format
msgid "Error: 'general permissions': %s"
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
index f162a49659..cd1e672289 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/devices/ovs/nm-ovsdb.c
@@ -1558,7 +1558,7 @@ ovsdb_try_connect (NMOvsdb *self)
if (priv->client)
return;
- /* XXX: This should probably be made configurable via NetworkManager.conf */
+ /* TODO: This should probably be made configurable via NetworkManager.conf */
addr = g_unix_socket_address_new (RUNSTATEDIR "/openvswitch/db.sock");
priv->client = g_socket_client_new ();
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 1490d90611..2cfc0d2b5c 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -2084,7 +2084,7 @@ device_removed (NMManager *manager, NMDevice *device, gpointer user_data)
NMPolicy *self = _PRIV_TO_SELF (priv);
ActivateData *data;
- /* XXX is this needed? The delegations are cleaned up
+ /* TODO: is this needed? The delegations are cleaned up
* on transition to deactivated too. */
ip6_remove_device_prefix_delegations (self, device);
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
index c927389e65..2af1daf3a6 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1
@@ -3,6 +3,6 @@ FOO='val
wrong line
F2=b
F3='b
-XXX=adf'
- XXX2=val2
+XXA=adf'
+ XXA2=val2
'
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
index 568b2efcd8..7f154073d4 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected
@@ -6,7 +6,7 @@ bar=
F2=b
F3=
#NM: F3='b
-XXX=
-#NM: XXX=adf'
- XXX2=val2
+XXA=
+#NM: XXA=adf'
+ XXA2=val2
#NM: '