SF.net SVN: geany: [978] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Wed Nov 8 16:22:06 UTC 2006 

Revision: 978
          http://svn.sourceforge.net/geany/?rev=978&view=rev
Author:   ntrel
Date:     2006-11-08 08:21:46 -0800 (Wed, 08 Nov 2006)

Log Message:
-----------
Rename utils_strcmp() utils_str_equal() (to avoid return value
confusion with strcmp()).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/about.c
    trunk/src/callbacks.c
    trunk/src/document.c
    trunk/src/encodings.c
    trunk/src/gb.c
    trunk/src/keyfile.c
    trunk/src/prefs.c
    trunk/src/sci_cb.c
    trunk/src/search.c
    trunk/src/symbols.c
    trunk/src/utils.c
    trunk/src/utils.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/ChangeLog	2006-11-08 16:21:46 UTC (rev 978)
@@ -14,6 +14,11 @@
    Never show the Sidebar if app->show_sidebar is false (prevents
    showing Sidebar after setting Preferences, when user has chosen to
    hide the Sidebar).
+ * src/utils.c, src/utils.h, src/about.c, src/callbacks.c,
+   src/sci_cb.c, src/keyfile.c, src/search.c, src/encodings.c,
+   src/document.c, src/prefs.c, src/gb.c, src/symbols.c:
+   Rename utils_strcmp() utils_str_equal() (to avoid return value
+   confusion with strcmp()).
 
 
 2006-11-07  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/about.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -126,7 +126,7 @@
 	header_label = gtk_label_new(NULL);
 	gtk_label_set_use_markup(GTK_LABEL(header_label), TRUE);
 	// print the subversion revision if it is available
-	g_snprintf(buffer, sizeof(buffer), HEADER, (utils_strcmp(REVISION, "-1")) ? "" : " (" REVISION ")");
+	g_snprintf(buffer, sizeof(buffer), HEADER, (utils_str_equal(REVISION, "-1")) ? "" : " (" REVISION ")");
 	gtk_label_set_markup(GTK_LABEL(header_label), buffer);
 	gtk_widget_show(header_label);
 	gtk_box_pack_start(GTK_BOX(header_hbox), header_label, FALSE,FALSE,0);

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/callbacks.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -1706,24 +1706,24 @@
 
 	if (idx < 0 || ! doc_list[idx].is_valid) return;
 
-	if (utils_strcmp(_("dd.mm.yyyy"), (gchar*) user_data))
+	if (utils_str_equal(_("dd.mm.yyyy"), (gchar*) user_data))
 		format = "%d.%m.%Y";
-	else if (utils_strcmp(_("mm.dd.yyyy"), (gchar*) user_data))
+	else if (utils_str_equal(_("mm.dd.yyyy"), (gchar*) user_data))
 		format = "%m.%d.%Y";
-	else if (utils_strcmp(_("yyyy/mm/dd"), (gchar*) user_data))
+	else if (utils_str_equal(_("yyyy/mm/dd"), (gchar*) user_data))
 		format = "%Y/%m/%d";
-	else if (utils_strcmp(_("dd.mm.yyyy hh:mm:ss"), (gchar*) user_data))
+	else if (utils_str_equal(_("dd.mm.yyyy hh:mm:ss"), (gchar*) user_data))
 		format = "%d.%m.%Y %H:%M:%S";
-	else if (utils_strcmp(_("mm.dd.yyyy hh:mm:ss"), (gchar*) user_data))
+	else if (utils_str_equal(_("mm.dd.yyyy hh:mm:ss"), (gchar*) user_data))
 		format = "%m.%d.%Y %H:%M:%S";
-	else if (utils_strcmp(_("yyyy/mm/dd hh:mm:ss"), (gchar*) user_data))
+	else if (utils_str_equal(_("yyyy/mm/dd hh:mm:ss"), (gchar*) user_data))
 		format = "%Y/%m/%d %H:%M:%S";
-	else if (utils_strcmp(_("Use custom date format"), (gchar*) user_data))
+	else if (utils_str_equal(_("Use custom date format"), (gchar*) user_data))
 		format = app->custom_date_format;
 	else
 	{
 		// set default value
-		if (utils_strcmp("", app->custom_date_format)) app->custom_date_format = g_strdup("%d.%m.%Y");
+		if (utils_str_equal("", app->custom_date_format)) app->custom_date_format = g_strdup("%d.%m.%Y");
 
 		dialogs_show_input(_("Custom date format"),
 			_("Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information."),
@@ -1757,7 +1757,7 @@
 	gint idx = document_get_cur_idx(), pos = -1;
 	gchar *text;
 
-	if (utils_strcmp(user_data, "blank"))
+	if (utils_str_equal(user_data, "blank"))
 	{
 		text = g_strdup("#include \"\"\n");
 		pos = editor_info.click_pos + 10;
@@ -1792,7 +1792,7 @@
 		{
 			newstr = gtk_entry_get_text(
 					GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry1")));
-			if (! utils_strcmp(newstr, programs->compiler))
+			if (! utils_str_equal(newstr, programs->compiler))
 			{
 				if (programs->compiler) g_free(programs->compiler);
 				programs->compiler = g_strdup(newstr);
@@ -1803,7 +1803,7 @@
 		{
 			newstr = gtk_entry_get_text(
 					GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry2")));
-			if (! utils_strcmp(newstr, programs->linker))
+			if (! utils_str_equal(newstr, programs->linker))
 			{
 				if (programs->linker) g_free(programs->linker);
 				programs->linker = g_strdup(newstr);
@@ -1814,7 +1814,7 @@
 		{
 			newstr = gtk_entry_get_text(
 					GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry3")));
-			if (! utils_strcmp(newstr, programs->run_cmd))
+			if (! utils_str_equal(newstr, programs->run_cmd))
 			{
 				if (programs->run_cmd) g_free(programs->run_cmd);
 				programs->run_cmd = g_strdup(newstr);
@@ -1840,7 +1840,7 @@
 
 		newstr = gtk_entry_get_text(
 				GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry1")));
-		if (! utils_strcmp(newstr, programs->compiler))
+		if (! utils_str_equal(newstr, programs->compiler))
 		{
 			if (programs->compiler) g_free(programs->compiler);
 			programs->compiler = g_strdup(newstr);
@@ -1848,7 +1848,7 @@
 		}
 		newstr = gtk_entry_get_text(
 				GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry2")));
-		if (! utils_strcmp(newstr, programs->linker))
+		if (! utils_str_equal(newstr, programs->linker))
 		{
 			if (programs->linker) g_free(programs->linker);
 			programs->linker = g_strdup(newstr);
@@ -1856,7 +1856,7 @@
 		}
 		newstr = gtk_entry_get_text(
 				GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry3")));
-		if (! utils_strcmp(newstr, programs->run_cmd))
+		if (! utils_str_equal(newstr, programs->run_cmd))
 		{
 			if (programs->run_cmd) g_free(programs->run_cmd);
 			programs->run_cmd = g_strdup(newstr);
@@ -1864,7 +1864,7 @@
 		}
 		newstr = gtk_entry_get_text(
 				GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry4")));
-		if (! utils_strcmp(newstr, programs->run_cmd2))
+		if (! utils_str_equal(newstr, programs->run_cmd2))
 		{
 			if (programs->run_cmd2) g_free(programs->run_cmd2);
 			programs->run_cmd2 = g_strdup(newstr);
@@ -1947,7 +1947,7 @@
 	guint i = GPOINTER_TO_INT(user_data);
 
 	if (app->ignore_callback || ! DOC_IDX_VALID(idx) || encodings[i].charset == NULL ||
-		utils_strcmp(encodings[i].charset, doc_list[idx].encoding)) return;
+		utils_str_equal(encodings[i].charset, doc_list[idx].encoding)) return;
 
 	if (doc_list[idx].readonly)
 	{

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/document.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -92,7 +92,7 @@
 		// ignore the case of filenames and paths under WIN32, causes errors if not
 		if (dl_fname && ! strcasecmp(dl_fname, filename)) return i;
 #else
-		if (dl_fname && utils_strcmp(dl_fname, filename)) return i;
+		if (dl_fname && utils_str_equal(dl_fname, filename)) return i;
 #endif
 	}
 	return -1;
@@ -455,7 +455,7 @@
 handle_forced_encoding(gchar **data, gsize *size, const gchar *forced_enc, gchar **enc,
 	gboolean *bom)
 {
-	if (utils_strcmp(forced_enc, "UTF-8"))
+	if (utils_str_equal(forced_enc, "UTF-8"))
 	{
 		if (! g_utf8_validate(*data, *size, NULL))
 		{
@@ -463,7 +463,7 @@
 		}
 		else
 		{
-			*bom = utils_strcmp(utils_scan_unicode_bom(*data), "UTF-8");
+			*bom = utils_str_equal(utils_scan_unicode_bom(*data), "UTF-8");
 			*enc = g_strdup(forced_enc);
 		}
 	}
@@ -480,7 +480,7 @@
 			g_free(*data);
 			*data = (void*)converted_text;
 			*size = strlen(converted_text);
-			*bom = utils_strcmp(utils_scan_unicode_bom(*data), "UTF-8");
+			*bom = utils_str_equal(utils_scan_unicode_bom(*data), "UTF-8");
 			*enc = g_strdup(forced_enc);
 		}
 	}
@@ -659,7 +659,7 @@
 	if (forced_enc != NULL)
 	{
 		// the encoding should be ignored(requested by user), so open the file "as it is"
-		if (utils_strcmp(forced_enc, encodings[GEANY_ENCODING_NONE].charset))
+		if (utils_str_equal(forced_enc, encodings[GEANY_ENCODING_NONE].charset))
 		{
 			bom = FALSE;
 			enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset);
@@ -824,8 +824,8 @@
 	}
 
 	// save in original encoding, skip when it is already UTF-8 or has the encoding "None"
-	if (doc_list[idx].encoding != NULL && ! utils_strcmp(doc_list[idx].encoding, "UTF-8") &&
-		! utils_strcmp(doc_list[idx].encoding, encodings[GEANY_ENCODING_NONE].charset))
+	if (doc_list[idx].encoding != NULL && ! utils_str_equal(doc_list[idx].encoding, "UTF-8") &&
+		! utils_str_equal(doc_list[idx].encoding, encodings[GEANY_ENCODING_NONE].charset))
 	{
 		GError *conv_error = NULL;
 		gchar* conv_file_contents = NULL;
@@ -1572,7 +1572,7 @@
 void document_set_encoding(gint idx, const gchar *new_encoding)
 {
 	if (! DOC_IDX_VALID(idx) || new_encoding == NULL ||
-		utils_strcmp(new_encoding, doc_list[idx].encoding)) return;
+		utils_str_equal(new_encoding, doc_list[idx].encoding)) return;
 
 	g_free(doc_list[idx].encoding);
 	doc_list[idx].encoding = g_strdup(new_encoding);
@@ -1669,7 +1669,7 @@
 	doc_list[idx].changed =
 		(sci_is_modified(doc_list[idx].sci) ||
 		doc_list[idx].has_bom != doc_list[idx].saved_encoding.has_bom ||
-		! utils_strcmp(doc_list[idx].encoding, doc_list[idx].saved_encoding.encoding));
+		! utils_str_equal(doc_list[idx].encoding, doc_list[idx].saved_encoding.encoding));
 	document_set_text_changed(idx);
 }
 

Modified: trunk/src/encodings.c
===================================================================
--- trunk/src/encodings.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/encodings.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -176,7 +176,7 @@
 	i = 0;
 	while (i < GEANY_ENCODINGS_MAX)
 	{
-		if (utils_strcmp(charset, encodings[i].charset)) break;
+		if (utils_str_equal(charset, encodings[i].charset)) break;
 		i++;
 	}
 	if (i == GEANY_ENCODINGS_MAX) i = GEANY_ENCODING_UTF_8; // fallback to UTF-8

Modified: trunk/src/gb.c
===================================================================
--- trunk/src/gb.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/gb.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -1324,7 +1324,7 @@
 		{
 			text[4] = 'y';
 			text[5] = '\0';
-			if (utils_strcmp(text, "geany")) gb_start_easteregg();
+			if (utils_str_equal(text, "geany")) gb_start_easteregg();
 			return TRUE;
 			break;
 		}

Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/keyfile.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -379,7 +379,7 @@
 
 		vc = g_new0(VteConfig, 1);
 		vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL);
-		if ((vte_info.dir == NULL || utils_strcmp(vte_info.dir, "")) && pw != NULL)
+		if ((vte_info.dir == NULL || utils_str_equal(vte_info.dir, "")) && pw != NULL)
 			// last dir is not set, fallback to user's home directory
 			vte_info.dir = g_strdup(pw->pw_dir);
 		else if (vte_info.dir == NULL && pw == NULL)

Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/prefs.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -854,7 +854,7 @@
 
 		for (idx = 0; idx < GEANY_MAX_KEYS; idx++)
 		{
-			if (utils_strcmp(dialog_key_name, keys[idx]->label)) break;
+			if (utils_str_equal(dialog_key_name, keys[idx]->label)) break;
 		}
 
 		gtk_accelerator_parse(gtk_label_get_text(GTK_LABEL(dialog_label)), &lkey, &lmods);

Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/sci_cb.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -1078,15 +1078,15 @@
 		str_found = utils_find_open_xml_tag(sel, pos - min, FALSE);
 
 	// when found string is something like br, img or another short tag, quit
-	if (utils_strcmp(str_found, "br")
-	 || utils_strcmp(str_found, "img")
-	 || utils_strcmp(str_found, "base")
-	 || utils_strcmp(str_found, "basefont")	// < or not <
-	 || utils_strcmp(str_found, "frame")
-	 || utils_strcmp(str_found, "input")
-	 || utils_strcmp(str_found, "link")
-	 || utils_strcmp(str_found, "area")
-	 || utils_strcmp(str_found, "meta"))
+	if (utils_str_equal(str_found, "br")
+	 || utils_str_equal(str_found, "img")
+	 || utils_str_equal(str_found, "base")
+	 || utils_str_equal(str_found, "basefont")	// < or not <
+	 || utils_str_equal(str_found, "frame")
+	 || utils_str_equal(str_found, "input")
+	 || utils_str_equal(str_found, "link")
+	 || utils_str_equal(str_found, "area")
+	 || utils_str_equal(str_found, "meta"))
 	{
 		return FALSE;
 	}
@@ -1103,7 +1103,7 @@
 		if (ch == '>')
 		{
 			SSM(sci, SCI_SETSEL, pos, pos);
-			if (utils_strcmp(str_found, "table")) sci_cb_auto_table(sci, pos);
+			if (utils_str_equal(str_found, "table")) sci_cb_auto_table(sci, pos);
 		}
 		sci_end_undo_action(sci);
 		g_free(to_insert);

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/search.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -627,7 +627,7 @@
 	g_free(cur_dir);
 
 	// put the focus to the directory entry if it is empty
-	if (utils_strcmp(gtk_entry_get_text(GTK_ENTRY(entry1)), ""))
+	if (utils_str_equal(gtk_entry_get_text(GTK_ENTRY(entry1)), ""))
 		gtk_widget_grab_focus(entry1);
 	else
 		gtk_widget_grab_focus(entry2);
@@ -927,7 +927,7 @@
 		const gchar *utf8_dir =
 			gtk_entry_get_text(GTK_ENTRY(lookup_widget(widgets.find_in_files_dialog, "entry_dir")));
 
-		if (utf8_dir == NULL || utils_strcmp(utf8_dir, ""))
+		if (utf8_dir == NULL || utils_str_equal(utf8_dir, ""))
 			msgwin_status_add(_("Invalid directory for find in files."));
 		else if (search_text && *search_text)
 		{

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/symbols.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -169,7 +169,7 @@
 		}
 
 		// do this comparison only once
-		if (utils_strcmp(doc_list[idx].encoding, "UTF-8")) doc_is_utf8 = TRUE;
+		if (utils_str_equal(doc_list[idx].encoding, "UTF-8")) doc_is_utf8 = TRUE;
 
 		for (i = 0; i < (doc_list[idx].tm_file)->tags_array->len; ++i)
 		{
@@ -254,7 +254,7 @@
 
 	for (i = 0; i < tags->len; ++i)
 	{
-		if (utils_strcmp(TM_TAG(tags->pdata[i])->name, tag_name))
+		if (utils_str_equal(TM_TAG(tags->pdata[i])->name, tag_name))
 			return TM_TAG(tags->pdata[i]);
 	}
 	return NULL;

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/utils.c	2006-11-08 16:21:46 UTC (rev 978)
@@ -683,7 +683,7 @@
  * NULL-safe string comparison. Returns TRUE if both a and b are
  * NULL or if a and b refer to valid strings which are equal.
  */
-gboolean utils_strcmp(const gchar *a, const gchar *b)
+gboolean utils_str_equal(const gchar *a, const gchar *b)
 {
 	if (a == NULL && b == NULL) return TRUE;
 	else if (a == NULL || b == NULL) return FALSE;

Modified: trunk/src/utils.h
===================================================================
--- trunk/src/utils.h	2006-11-08 11:57:20 UTC (rev 977)
+++ trunk/src/utils.h	2006-11-08 16:21:46 UTC (rev 978)
@@ -75,7 +75,7 @@
  * NULL-safe string comparison. Returns TRUE if both a and b are
  * NULL or if a and b refer to valid strings which are equal.
  */
-gboolean utils_strcmp(const gchar *a, const gchar *b);
+gboolean utils_str_equal(const gchar *a, const gchar *b);
 
 /* removes the extension from filename and return the result in
  * a newly allocated string */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the Commits mailing list