From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 10 Feb 2021 18:17:47 +0000 (+0900)
Subject: Merge pull request #11484 from keszybz/udevadm-error-logs
X-Git-Tag: v248-rc1~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa7924db0bd836e30021c9b2c0480f0beb1a85d6;p=thirdparty%2Fsystemd.git

Merge pull request #11484 from keszybz/udevadm-error-logs

Use real return codes in _from_string() functions
---

fa7924db0bd836e30021c9b2c0480f0beb1a85d6
diff --cc src/shared/format-table.h
index 732abf27ec6,7adb245319c..5a8c1adfae8
--- a/src/shared/format-table.h
+++ b/src/shared/format-table.h
@@@ -58,9 -54,19 +58,9 @@@ typedef enum TableDataType 
          TABLE_SET_URL,
          TABLE_SET_UPPERCASE,
  
-         _TABLE_DATA_TYPE_INVALID = -1,
+         _TABLE_DATA_TYPE_INVALID = -EINVAL,
  } TableDataType;
  
 -/* PIDs are just 32bit signed integers on Linux */
 -#define TABLE_PID TABLE_INT32
 -assert_cc(sizeof(pid_t) == sizeof(int32_t));
 -
 -/* UIDs/GIDs are just 32bit unsigned integers on Linux */
 -#define TABLE_UID TABLE_UINT32
 -#define TABLE_GID TABLE_UINT32
 -assert_cc(sizeof(uid_t) == sizeof(uint32_t));
 -assert_cc(sizeof(gid_t) == sizeof(uint32_t));
 -
  typedef struct Table Table;
  typedef struct TableCell TableCell;
  
diff --cc src/systemctl/systemctl.h
index 722853db2a6,dd8da074408..0ebe4580c60
--- a/src/systemctl/systemctl.h
+++ b/src/systemctl/systemctl.h
@@@ -29,10 -29,9 +29,10 @@@ enum action 
          ACTION_RELOAD,
          ACTION_REEXEC,
          ACTION_RUNLEVEL,
 +        ACTION_TELINIT,
          ACTION_CANCEL_SHUTDOWN,
          _ACTION_MAX,
-         _ACTION_INVALID = -1
+         _ACTION_INVALID = -EINVAL,
  };
  
  enum dependency {