diff --git a/generator/errnostring.ml b/generator/errnostring.ml index d16a07ecd..b3d718815 100644 --- a/generator/errnostring.ml +++ b/generator/errnostring.ml @@ -229,9 +229,8 @@ extern const char *guestfs_int_errno_to_string (int errnum); */ extern int guestfs_int_string_to_errno (const char *errnostr); -/* Private structure and function used by the perfect hash implementation. */ +/* Private structure used by the perfect hash implementation. */ struct errnostring_entry { char *name; int errnum; }; -extern const struct errnostring_entry *guestfs_int_string_to_errno_lookup (register const char *str, register unsigned int len); #endif /* GUESTFS_ERRNOSTRING_H_ */ " @@ -277,17 +276,6 @@ guestfs_int_errno_to_string (int errnum) else return errno_to_string[errnum]; } - -int -guestfs_int_string_to_errno (const char *errnostr) -{ - const struct errnostring_entry *v = - guestfs_int_string_to_errno_lookup (errnostr, strlen (errnostr)); - if (v /* not necessary to check v->name != NULL here */) - return v->errnum; - else - return EINVAL; -} " let generate_errnostring_gperf () = @@ -337,4 +325,19 @@ struct errnostring_entry; List.iter ( fun e -> pr "%s, %s\n" e e - ) errnos + ) errnos; + + pr "\ +%%%% + +int +guestfs_int_string_to_errno (const char *errnostr) +{ + const struct errnostring_entry *v = + guestfs_int_string_to_errno_lookup (errnostr, strlen (errnostr)); + if (v /* not necessary to check v->name != NULL here */) + return v->errnum; + else + return EINVAL; +} +"