Context Navigation

Back to Ticket #3598

Ticket #3598: mc-3598-0034-strutil-strutil8bit.c-cleanup-Wcast-qual-warning.patch

File mc-3598-0034-strutil-strutil8bit.c-cleanup-Wcast-qual-warning.patch, 5.4 KB (added by and, 8 years ago)

lib/strutil/strutil8bit.c

From 4a1cbf8cf50fc664f30ecb3ab86d9349e8e0d77e Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 16:55:44 +0000
Subject: [PATCH] strutil/strutil8bit.c: cleanup -Wcast-qual warning

strutil8bit.c: In function 'str_8bit_vfs_convert_to':
strutil8bit.c:280:39: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
         result = str_nconvert (coder, (char *) string, size, buffer);
                                       ^
strutil8bit.c: In function 'str_8bit_create_search_needle':
strutil8bit.c:559:12: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     return (char *) needle;
            ^
strutil8bit.c: In function 'str_8bit_search_first':
strutil8bit.c:598:30: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     fold_text = (case_sen) ? (char *) text : str_8bit_strdown (text);
                              ^
strutil8bit.c:599:32: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     fold_search = (case_sen) ? (char *) search : str_8bit_strdown (search);
                                ^
strutil8bit.c: In function 'str_8bit_search_last':
strutil8bit.c:628:30: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     fold_text = (case_sen) ? (char *) text : str_8bit_strdown (text);
                              ^
strutil8bit.c:629:32: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     fold_search = (case_sen) ? (char *) search : str_8bit_strdown (search);
                                ^
strutil8bit.c: In function 'str_8bit_create_key':
strutil8bit.c:780:25: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
     return (case_sen) ? (char *) text : str_8bit_strdown (text);
                         ^

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 lib/strutil/strutil8bit.c | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/lib/strutil/strutil8bit.c b/lib/strutil/strutil8bit.c
index 2e0db80..66b8754 100644

a	b	str_8bit_vfs_convert_to (GIConv coder, const char string, int size, GString * b*
277	277	if (coder == str_cnv_not_convert)
278	278	g_string_append_len (buffer, string, size);
279	279	else
280		result = str_nconvert (coder, ~~(char *)~~ string, size, buffer);
	280	result = str_nconvert (coder, string, size, buffer);
281	281
282	282	return result;
283	283	}
…	…	static char *
556	556	str_8bit_create_search_needle (const char *needle, int case_sen)
557	557	{
558	558	(void) case_sen;
559		return ~~(char *) needle~~;
	559	return g_strdup (needle);
560	560	}
561	561
562	562	/* --------------------------------------------------------------------------------------------- */
…	…	static void
565	565	str_8bit_release_search_needle (char *needle, int case_sen)
566	566	{
567	567	(void) case_sen;
568		~~(void) needle~~;
	568	g_free (needle);
569	569	}
570	570
571	571	/* --------------------------------------------------------------------------------------------- */
…	…	str_8bit_search_first (const char text, const char search, int case_sen)
595	595	char *fold_search;
596	596	const char *match;
597	597
598		fold_text = (case_sen) ? ~~(char *) text~~ : str_8bit_strdown (text);
599		fold_search = (case_sen) ? ~~(char *) search~~ : str_8bit_strdown (search);
	598	fold_text = (case_sen) ? g_strdup (text) : str_8bit_strdown (text);
	599	fold_search = (case_sen) ? g_strdup (search) : str_8bit_strdown (search);
600	600
601	601	match = g_strstr_len (fold_text, -1, fold_search);
602	602	if (match != NULL)
…	…	str_8bit_search_first (const char text, const char search, int case_sen)
607	607	match = text + offset;
608	608	}
609	609
610		if (!case_sen)
611		{
612		g_free (fold_text);
613		g_free (fold_search);
614		}
	610	g_free (fold_text);
	611	g_free (fold_search);
615	612
616	613	return match;
617	614	}
…	…	str_8bit_search_last (const char text, const char search, int case_sen)
625	622	char *fold_search;
626	623	const char *match;
627	624
628		fold_text = (case_sen) ? ~~(char *) text~~ : str_8bit_strdown (text);
629		fold_search = (case_sen) ? ~~(char *) search~~ : str_8bit_strdown (search);
	625	fold_text = (case_sen) ? g_strdup (text) : str_8bit_strdown (text);
	626	fold_search = (case_sen) ? g_strdup (search) : str_8bit_strdown (search);
630	627
631	628	match = g_strrstr_len (fold_text, -1, fold_search);
632	629	if (match != NULL)
…	…	str_8bit_search_last (const char text, const char search, int case_sen)
637	634	match = text + offset;
638	635	}
639	636
640		if (!case_sen)
641		{
642		g_free (fold_text);
643		g_free (fold_search);
644		}
	637	g_free (fold_text);
	638	g_free (fold_search);
645	639
646	640	return match;
647	641	}
…	…	str_8bit_fix_string (char text)*
777	771	static char *
778	772	str_8bit_create_key (const char *text, int case_sen)
779	773	{
780		return (case_sen) ? ~~(char *) text~~ : str_8bit_strdown (text);
	774	return (case_sen) ? g_strdup (text) : str_8bit_strdown (text);
781	775	}
782	776
783	777	/* --------------------------------------------------------------------------------------------- */
…	…	str_8bit_key_collate (const char t1, const char t2, int case_sen)
796	790	static void
797	791	str_8bit_release_key (char *key, int case_sen)
798	792	{
799		~~if (!case_sen)~~
800		g_free (key);
	793	(void) case_sen;
	794	g_free (key);
801	795	}
802	796
803	797	/* --------------------------------------------------------------------------------------------- */

Download in other formats:

Original Format