Merge commit 'origin/236_replace_gboolean'

ChangeLog

@@ -3,6 +3,7 @@
 	* src/util.c: fixed name_trunc() on NULL or empty parameters
 	* src/achown.c: fixed unitialized var in init_chown_advanced()
 	  (patch from andrew_b)
+	* replaced gboolean by bool (from mhl/types.h)
 
 2009-01-31 Enrico Weigelt, metux ITS <weigelt@metux.de>, Patrick Winnertz <winnie@debian.org>, Slava Zanko <slavazanko@gmail.com>, Sergei Trofimovich  <slyfox@inbox.ru>
 

edit/usermap.c

@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <mhl/types.h>
 #include <mhl/string.h>
 
 #include "../src/global.h"
@@ -57,7 +58,7 @@ typedef struct Config {
 
 typedef struct Command {
     const char *name;
-    int (*handler) (config_t *cfg, int argc, char *argv[]);
+    bool (*handler) (config_t *cfg, int argc, char *argv[]);
 } command_t;
 
 static char error_msg[200] = "Nobody see this";
@@ -253,7 +254,7 @@ cfg_free_maps(config_t *cfg)
 static GPtrArray *
 split_line(char *str)
 {
-    gboolean inside_quote = FALSE;
+    bool inside_quote = false;
     int move = 0;
     GPtrArray *args;    
 
@@ -343,7 +344,7 @@ keymap_add(GArray *keymap, int key, int cmd)
 }
 
 /* bind <key> <command> */
-static gboolean
+static bool
 cmd_bind(config_t *cfg, int argc, char *argv[])
 {
     char *keyname, *command;
@@ -354,7 +355,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
     if (argc != 3) {
 	snprintf(error_msg, sizeof(error_msg),
 		 _("bind: Wrong argument number, bind <key> <command>"));
-	return FALSE;
+	return false;
     }
 
     keyname = argv[1];
@@ -376,7 +377,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
 	    if (!m) {		/* incorrect key */
 		snprintf(error_msg, sizeof(error_msg),
 			 _("bind: Bad key value `%s'"), keyname);
-		return FALSE;
+		return false;
 	    }
 	    mod |= m;
 	    m = 0;
@@ -389,7 +390,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
     /* no key */
     if (keyname[0] == '\0') {
 	snprintf(error_msg, sizeof(error_msg), _("bind: Ehh...no key?"));
-	return FALSE;
+	return false;
     }
 
     /* ordinary key */
@@ -403,7 +404,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
     if (k < 0 && !key->name) {
 	snprintf(error_msg, sizeof(error_msg),
 		 _("bind: Unknown key: `%s'"), keyname);
-	return FALSE;
+	return false;
     }
 
     while (cmd->name && strcasecmp(cmd->name, command) != 0)
@@ -412,7 +413,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
     if (!cmd->name) {
 	snprintf(error_msg, sizeof(error_msg),
 		 _("bind: Unknown command: `%s'"), command);
-	return FALSE;
+	return false;
     }
 
     if (mod & KEY_M_CTRL) {
@@ -433,7 +434,7 @@ cmd_bind(config_t *cfg, int argc, char *argv[])
     else
 	keymap_add(cfg->keymap, k, cmd->val);
 
-    return TRUE;
+    return true;
 }
 
 #if 0
@@ -469,7 +470,7 @@ static void edit_my_define (Dlg_head * h, int idx, const char *text,
 #endif
 
 /* label <number> <command> <label> */
-static gboolean
+static bool
 cmd_label(config_t *cfg, int argc, char *argv[])
 {
     const name_map_t *cmd = command_names;
@@ -480,7 +481,7 @@ cmd_label(config_t *cfg, int argc, char *argv[])
 	snprintf(error_msg, sizeof(error_msg),
 		 _("%s: Syntax: %s <n> <command> <label>"), 
 		argv[0], argv[0]);
-	return FALSE;
+	return false;
     }
     
     fn	= strtol(argv[1], NULL, 0);
@@ -493,23 +494,23 @@ cmd_label(config_t *cfg, int argc, char *argv[])
     if (!cmd->name) {
 	snprintf(error_msg, sizeof(error_msg),
 		 _("%s: Unknown command: `%s'"), argv[0], command);
-	return FALSE;
+	return false;
     }
     
     if (fn < 1 || fn > 10) {
 	snprintf(error_msg, sizeof(error_msg),
 		 _("%s: fn should be 1-10"), argv[0]);
-	return FALSE;
+	return false;
     }
 
     keymap_add(cfg->keymap, KEY_F(fn), cmd->val);
     cfg->labels[fn - 1] = g_strdup(label);
 
-    return TRUE;
+    return true;
 }
 
 
-static gboolean
+static bool
 parse_file(config_t *cfg, const char *file, const command_t *cmd)
 {
     char buf[200];
@@ -520,7 +521,7 @@ parse_file(config_t *cfg, const char *file, const command_t *cmd)
     if (!fp) {
 	snprintf(error_msg, sizeof(error_msg), _("%s: fopen(): %s"),
 		 file, strerror(errno));
-	return FALSE;
+	return false;
     }
 
     while (fgets(buf, sizeof(buf), fp)) {
@@ -547,7 +548,7 @@ parse_file(config_t *cfg, const char *file, const command_t *cmd)
 		     argv[0]);
 	    g_ptr_array_free(args, TRUE);
 	    fclose(fp);
-	    return FALSE;
+	    return false;
 	}
 
 	if (!(c->handler(cfg, args->len, argv))) {
@@ -557,16 +558,16 @@ parse_file(config_t *cfg, const char *file, const command_t *cmd)
 	    g_free(ss);
 	    g_ptr_array_free(args, TRUE);
 	    fclose(fp);
-	    return FALSE;
+	    return false;
 	}
 	g_ptr_array_free(args, TRUE);
     }
 
     fclose(fp);
-    return TRUE;
+    return true;
 }
 
-static gboolean
+static bool
 load_user_keymap(config_t *cfg, const char *file)
 {
     const command_t cmd[] = {
@@ -580,13 +581,13 @@ load_user_keymap(config_t *cfg, const char *file)
     cfg->ext_keymap = g_array_new(TRUE, FALSE, sizeof(edit_key_map_type));
 
     if (!parse_file(cfg, file, cmd)) {
-	return FALSE;
+	return false;
     }
 
-    return TRUE;
+    return true;
 }
 
-gboolean
+bool
 edit_load_user_map(WEdit *edit)
 {
     static config_t cfg;
@@ -595,7 +596,7 @@ edit_load_user_map(WEdit *edit)
     struct stat s;
 
     if (edit_key_emulation != EDIT_KEY_EMULATION_USER)
-	return TRUE;
+	return true;
 
     file = mhl_str_dir_plus_file(home_dir, MC_USERMAP);
 
@@ -604,7 +605,7 @@ edit_load_user_map(WEdit *edit)
 	edit_error_dialog(_("Error"), msg);
 	g_free(msg);
 	g_free(file);
-	return FALSE;
+	return false;
     }
 
     if (s.st_mtime != cfg.mtime) {
@@ -615,7 +616,7 @@ edit_load_user_map(WEdit *edit)
 	    edit_error_dialog(_("Error"), error_msg);
 	    cfg_free_maps(&new_cfg);
 	    g_free(file);
-	    return FALSE;
+	    return false;
 	} else {
 	    cfg_free_maps(&cfg);
 	    cfg = new_cfg;
@@ -628,5 +629,5 @@ edit_load_user_map(WEdit *edit)
 
     g_free(file);
 
-    return TRUE;
+    return true;
 }

edit/usermap.h

@@ -1,11 +1,13 @@
 #ifndef MC_USERMAP_H
 #define MC_USERMAP_H
 
+#include <mhl/types.h>
+
 #define MC_USERMAP ".mc/cedit/cooledit.bindings"
 
 #include "edit.h"
 
 /* load user map */
-gboolean edit_load_user_map(WEdit *);
+bool edit_load_user_map(WEdit *);
 
 #endif

src/ecs-test.c

@@ -29,11 +29,13 @@
 #include <locale.h>
 #include <stdio.h>
 
+#include <mhl/types.h>
+
 #include "global.h"
 #include "ecs.h"
 
 #ifdef EXTCHARSET_ENABLED
-static gboolean
+static bool
 change_locale(const char *loc)
 {
 	const char *ident;
@@ -65,7 +67,7 @@ test_locale_en_US_UTF_8(void)
 	const char     *teststr_c   = "Zuckert\374te";
 	ecs_char       *ecs;
 	char           *mbs;
-	gboolean        valid;
+	bool        valid;
 
 	if (!change_locale("en_US.UTF-8")) return;
 

src/ecs.c

@@ -27,6 +27,8 @@
 #include <assert.h>
 #include <ctype.h>
 
+#include <mhl/types.h>
+
 #include "global.h"
 #include "ecs.h"
 
@@ -34,7 +36,7 @@
  * String type conversion
  */
 
-extern gboolean ecs_mbstr_to_str(ecs_char **ret_str, const char *s)
+extern bool ecs_mbstr_to_str(ecs_char **ret_str, const char *s)
 {
 #ifdef EXTCHARSET_ENABLED
 	size_t maxlen, len;
@@ -58,7 +60,7 @@ extern gboolean ecs_mbstr_to_str(ecs_char **ret_str, const char *s)
 #endif
 }
 
-extern gboolean ecs_str_to_mbstr(char **ret_str, const ecs_char *s)
+extern bool ecs_str_to_mbstr(char **ret_str, const ecs_char *s)
 {
 #ifdef EXTCHARSET_ENABLED
 	size_t maxlen, len;
@@ -100,57 +102,57 @@ extern gboolean ecs_str_to_mbstr(char **ret_str, const ecs_char *s)
 	(cf(c))
 #endif
 
-extern gboolean ecs_isalnum(ecs_char c)
+extern bool ecs_isalnum(ecs_char c)
 {
 	return ECS_CTYPE(iswalnum, isalnum, c);
 }
 
-extern gboolean ecs_isalpha(ecs_char c)
+extern bool ecs_isalpha(ecs_char c)
 {
 	return ECS_CTYPE(iswalpha, isalpha, c);
 }
 
-extern gboolean ecs_iscntrl(ecs_char c)
+extern bool ecs_iscntrl(ecs_char c)
 {
 	return ECS_CTYPE(iswcntrl, iscntrl, c);
 }
 
-extern gboolean ecs_isdigit(ecs_char c)
+extern bool ecs_isdigit(ecs_char c)
 {
 	return ECS_CTYPE(iswdigit, isdigit, c);
 }
 
-extern gboolean ecs_isgraph(ecs_char c)
+extern bool ecs_isgraph(ecs_char c)
 {
 	return ECS_CTYPE(iswgraph, isgraph, c);
 }
 
-extern gboolean ecs_islower(ecs_char c)
+extern bool ecs_islower(ecs_char c)
 {
 	return ECS_CTYPE(iswlower, islower, c);
 }
 
-extern gboolean ecs_isprint(ecs_char c)
+extern bool ecs_isprint(ecs_char c)
 {
 	return ECS_CTYPE(iswprint, isprint, c);
 }
 
-extern gboolean ecs_ispunct(ecs_char c)
+extern bool ecs_ispunct(ecs_char c)
 {
 	return ECS_CTYPE(iswpunct, ispunct, c);
 }
 
-extern gboolean ecs_isspace(ecs_char c)
+extern bool ecs_isspace(ecs_char c)
 {
 	return ECS_CTYPE(iswspace, isspace, c);
 }
 
-extern gboolean ecs_isupper(ecs_char c)
+extern bool ecs_isupper(ecs_char c)
 {
 	return ECS_CTYPE(iswupper, isupper, c);
 }
 
-extern gboolean ecs_isxdigit(ecs_char c)
+extern bool ecs_isxdigit(ecs_char c)
 {
 	return ECS_CTYPE(iswxdigit, isxdigit, c);
 }
@@ -314,7 +316,7 @@ ecs_strlcat(ecs_char *dst, const ecs_char *src, size_t dstsize)
 	return di + ecs_strlcpy(dst + di, src, dstsize - di);
 }
 
-gboolean
+bool
 ecs_strbox(const ecs_char *s, size_t *ret_width, size_t *ret_height)
 {
 	size_t nlines = 0, ncolumns = 0, colindex = 0, i;

src/ecs.h

@@ -44,6 +44,8 @@ typedef char ecs_char;
 #  define ECS_STR(s)		(s)
 #endif
 
+#include <mhl/types.h>
+
 /*
  * String conversion functions between the wide character encoding and
  * the multibyte encoding. The returned strings should be freed using
@@ -51,24 +53,24 @@ typedef char ecs_char;
  * and has been converted, FALSE otherwise.
  */
 
-extern gboolean ecs_mbstr_to_str(ecs_char **ret_str, const char *);
-extern gboolean ecs_str_to_mbstr(char **ret_str, const ecs_char *);
+extern bool ecs_mbstr_to_str(ecs_char **ret_str, const char *);
+extern bool ecs_str_to_mbstr(char **ret_str, const ecs_char *);
 
 /*
  * Replacements for the ISO C90 <ctype.h> functions.
  */
 
-extern gboolean ecs_isalnum(ecs_char);
-extern gboolean ecs_isalpha(ecs_char);
-extern gboolean ecs_iscntrl(ecs_char);
-extern gboolean ecs_isdigit(ecs_char);
-extern gboolean ecs_isgraph(ecs_char);
-extern gboolean ecs_islower(ecs_char);
-extern gboolean ecs_isprint(ecs_char);
-extern gboolean ecs_ispunct(ecs_char);
-extern gboolean ecs_isspace(ecs_char);
-extern gboolean ecs_isupper(ecs_char);
-extern gboolean ecs_isxdigit(ecs_char);
+extern bool ecs_isalnum(ecs_char);
+extern bool ecs_isalpha(ecs_char);
+extern bool ecs_iscntrl(ecs_char);
+extern bool ecs_isdigit(ecs_char);
+extern bool ecs_isgraph(ecs_char);
+extern bool ecs_islower(ecs_char);
+extern bool ecs_isprint(ecs_char);
+extern bool ecs_ispunct(ecs_char);
+extern bool ecs_isspace(ecs_char);
+extern bool ecs_isupper(ecs_char);
+extern bool ecs_isxdigit(ecs_char);
 
 /*
  * Replacements for the ISO C90 <string.h> functions.
@@ -105,7 +107,7 @@ extern size_t ecs_strlcat(ecs_char *, const ecs_char *, size_t);
  * displayed on screen. Returns TRUE if all characters in the string are
  * either '\n' or printable, according to the current locale. If the
  * return value is FALSE, ''width'' and ''height'' are not modified. */
-extern gboolean ecs_strbox(const ecs_char *, size_t *ret_width,
+extern bool ecs_strbox(const ecs_char *, size_t *ret_width,
 	size_t *ret_height);
 
 #endif

src/file.c

@@ -50,6 +50,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <mhl/types.h>
 #include <mhl/memory.h>
 #include <mhl/escape.h>
 #include <mhl/string.h>
@@ -1034,7 +1035,7 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d,
 {
     struct stat src_stats, dst_stats;
     int return_status = FILE_CONT;
-    gboolean copy_done = FALSE;
+    bool copy_done = FALSE;
 
     if (file_progress_show_source (ctx, s) == FILE_ABORT
 	|| file_progress_show_target (ctx, d) == FILE_ABORT)

src/find.c

@@ -27,6 +27,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include <mhl/types.h>
 #include <mhl/string.h>
 
 #include "global.h"
@@ -143,7 +144,7 @@ static void get_list_info (char **file, char **dir) {
 static regex_t *r; /* Pointer to compiled content_pattern */
  
 static int case_sensitive = 1;
-static gboolean find_regex_flag = TRUE;
+static bool find_regex_flag = TRUE;
 static int find_recursively = 1;
 
 /*

src/key.c

@@ -33,6 +33,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <mhl/types.h>
+
 #include "global.h"
 #include "tty.h"
 #include "mouse.h"
@@ -181,7 +183,7 @@ inline static int add_selects (fd_set *select_set)
 static void check_selects (fd_set *select_set)
 {
     SelectList *p;
-    gboolean retry;
+    bool retry;
 
     if (disabled_channels)
 	return;

src/logging.c

@@ -26,17 +26,19 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include <mhl/types.h>
+
 #include "global.h"
 #include "logging.h"
 #include "setup.h"
 
 /*** file scope functions **********************************************/
 
-static gboolean
+static bool
 is_logging_enabled(void)
 {
-	static gboolean logging_initialized = FALSE;
-	static gboolean logging_enabled = FALSE;
+	static bool logging_initialized = FALSE;
+	static bool logging_enabled = FALSE;
 	char *mc_ini;
 
 	if (!logging_initialized) {