X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Ferrno-list.c;h=c568629f7ba64cde19ae1e795ebb09a3795c8fd6;hp=fff37eb3e8438717d5c668b15c9d6eda899a597d;hb=084937b3d7c4da3e3c48d05779f8cfbdc39a2ce6;hpb=1cfc78c91965df340cdde100ad6cb3ed50b28927

diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index fff37eb3e..c568629f7 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -21,14 +19,14 @@
 
 #include <string.h>
 
-#include "util.h"
 #include "errno-list.h"
+#include "macro.h"
 
 static const struct errno_name* lookup_errno(register const char *str,
-                                                 register unsigned int len);
+                                             register GPERF_LEN_TYPE len);
 
-#include "errno-to-name.h"
 #include "errno-from-name.h"
+#include "errno-to-name.h"
 
 const char *errno_to_name(int id) {
 
@@ -48,13 +46,13 @@ int errno_from_name(const char *name) {
 
         sc = lookup_errno(name, strlen(name));
         if (!sc)
-                return 0;
+                return -EINVAL;
 
+        assert(sc->id > 0);
         return sc->id;
 }
 
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int errno_max(void) {
         return ELEMENTSOF(errno_names);
 }