X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=util.h;h=af39accc946c47c079ace7164f9e65c38d7f86db;hp=273ece89f1be7729a2963d12080805e682757018;hb=d3725859f3d80972d7da3a73b92e58a06ac7d69a;hpb=2d368c149b90a7b284035f8883eb0c3e64a2caab;ds=sidebyside diff --git a/util.h b/util.h index 273ece89f..af39accc9 100644 --- a/util.h +++ b/util.h @@ -163,10 +163,14 @@ bool ignore_file(const char *filename); } \ type name##_from_string(const char *s) { \ type i; \ + unsigned u; \ assert(s); \ for (i = 0; i < (type)ELEMENTSOF(name##_table); i++) \ if (streq(name##_table[i], s)) \ return i; \ + if (safe_atou(s, &u) >= 0 && \ + u < ELEMENTSOF(name##_table)) \ + return (type) u; \ return (type) -1; \ } \ struct __useless_struct_to_allow_trailing_semicolon__