]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #11484 from keszybz/udevadm-error-logs
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 10 Feb 2021 18:17:47 +0000 (03:17 +0900)
committerGitHub <noreply@github.com>
Wed, 10 Feb 2021 18:17:47 +0000 (03:17 +0900)
Use real return codes in _from_string() functions

1  2 
src/shared/format-table.h
src/systemctl/systemctl.h

index 732abf27ec66901a85ed221c2a9575c9fde35539,7adb245319c560ab91a6478d280ce60ac323bc21..5a8c1adfae85179e4c14f9e8251f839e2aa991b7
@@@ -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;
  
index 722853db2a6e62b9d4a32b34f8802a2abf09a4a3,dd8da0744083b87f1d2fbf05fc41ee4933467a7e..0ebe4580c6027b7c11122f48bcab6c4ebfa2fc0f
@@@ -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 {