Silence prototype conflicts

Forwarded: https://github.com/dovecot/core/pull/206

    program-client.c:705:5: warning: conflicting types for 'program_client_run' due to enum/integer mismatch; have 'int(struct program_client *)' [-Wenum-int-mismatch]
      705 | int program_client_run(struct program_client *pclient)
          |     ^~~~~~~~~~~~~~~~~~
    In file included from program-client-private.h:4,
                     from program-client.c:17:
    program-client.h:93:1: note: previous declaration of 'program_client_run' with type 'enum program_client_exit_status(struct program_client *)'
       93 | program_client_run(struct program_client *pclient);
          | ^~~~~~~~~~~~~~~~~~

    db-lua.c:599:1: warning: conflicting types for 'auth_lua_call_password_verify' due to enum/integer mismatch; have 'enum passdb_result(struct dlua_script *, struct auth_request *, const char *, const char **)' [-Wenum-int-mismatch]
      599 | auth_lua_call_password_verify(struct dlua_script *script,
          | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from db-lua.c:28:
    db-lua.h:14:5: note: previous declaration of 'auth_lua_call_password_verify' with type 'int(struct dlua_script *, struct auth_request *, const char *, const char **)'
       14 | int auth_lua_call_password_verify(struct dlua_script *script,
          |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Gbp-Pq: Name Silence-prototype-conflicts.patch

diff --git a/src/auth/db-lua.h b/src/auth/db-lua.h
index ebb697ac1d9050177d45d69bd2788a7ab1309dfc..cf859fb224e6bc5c62d91511ff6ac6ef53d9f177 100644 (file)
--- a/src/auth/db-lua.h
+++ b/src/auth/db-lua.h
@@ -11,9 +11,10 @@ struct dlua_script;
 
 int auth_lua_script_init(struct dlua_script *script, const char **error_r);
 
-int auth_lua_call_password_verify(struct dlua_script *script,
-                                 struct auth_request *req, const char *password,
-                                 const char **error_r);
+enum passdb_result
+auth_lua_call_password_verify(struct dlua_script *script,
+                             struct auth_request *req, const char *password,
+                             const char **error_r);
 
 enum passdb_result
 auth_lua_call_passdb_lookup(struct dlua_script *script,

diff --git a/src/lib-program-client/program-client.c b/src/lib-program-client/program-client.c
index c6c6ff6ff5bde3ff0d7be4ab4cc5a5f432f90512..cf55a6f9aa607566ce10d2bf8a367a2624cfb1ef 100644 (file)
--- a/src/lib-program-client/program-client.c
+++ b/src/lib-program-client/program-client.c
@@ -702,7 +702,7 @@ program_client_run_callback(int result, int *context)
        io_loop_stop(current_ioloop);
 }
 
-int program_client_run(struct program_client *pclient)
+enum program_client_exit_status program_client_run(struct program_client *pclient)
 {
        int ret = -2;
        struct ioloop *prev_ioloop = current_ioloop;
@@ -722,7 +722,7 @@ int program_client_run(struct program_client *pclient)
        io_loop_destroy(&ioloop);
 
        if (pclient->error != PROGRAM_CLIENT_ERROR_NONE)
-               return -1;
+               return PROGRAM_CLIENT_EXIT_STATUS_INTERNAL_FAILURE;
 
        return pclient->exit_status;
 }