diff options
| author | unknown <konstantin@mysql.com> | 2005-05-19 14:02:12 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-05-19 14:02:12 +0400 |
| commit | f87f045065197aa036ebf023cd8a6da76e23e013 (patch) | |
| tree | e402011a057d0c600410556ebe7dd8e4aaded194 | |
| parent | 252572224580b0a5f6737bd0b96830ad44ad248e (diff) | |
| download | mariadb-git-f87f045065197aa036ebf023cd8a6da76e23e013.tar.gz | |
Change the return type back to int (modify_defaults_file).
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.
include/my_sys.h:
Change the return type back to int (modify_defaults_file).
include/mysql_com.h:
Change the return type back to int (modify_defaults_file).
mysys/default_modify.c:
Change the return type back to int (modify_defaults_file).
| -rw-r--r-- | include/my_sys.h | 6 | ||||
| -rw-r--r-- | include/mysql_com.h | 6 | ||||
| -rw-r--r-- | mysys/default_modify.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 9c07fc2e923..473251f26cb 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -782,9 +782,9 @@ extern void get_defaults_files(int argc, char **argv, char **defaults, char **extra_defaults); extern int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); -extern uint modify_defaults_file(const char *file_location, const char *option, - const char *option_value, - const char *section_name, int remove_option); +extern int modify_defaults_file(const char *file_location, const char *option, + const char *option_value, + const char *section_name, int remove_option); extern int my_search_option_files(const char *conf_file, int *argc, char ***argv, uint *args_used, Process_option_func func, void *func_ctx); diff --git a/include/mysql_com.h b/include/mysql_com.h index a49bc01da8a..c608a2e7724 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -417,9 +417,9 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); /* Some other useful functions */ my_bool my_init(void); -extern uint modify_defaults_file(const char *file_location, const char *option, - const char *option_value, - const char *section_name, int remove_option); +extern int modify_defaults_file(const char *file_location, const char *option, + const char *option_value, + const char *section_name, int remove_option); int load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); my_bool my_thread_init(void); diff --git a/mysys/default_modify.c b/mysys/default_modify.c index c0589f54132..3476b8628cf 100644 --- a/mysys/default_modify.c +++ b/mysys/default_modify.c @@ -37,9 +37,9 @@ #define NEWLINE_LEN 1 #endif -uint modify_defaults_file(const char *file_location, const char *option, - const char *option_value, - const char *section_name, int remove_option) +int modify_defaults_file(const char *file_location, const char *option, + const char *option_value, + const char *section_name, int remove_option) { FILE *cnf_file; struct stat file_stat; |