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

@@ -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);

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);

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;