From f6a3e9a544c5365627450e036b855ae83f70b781 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sat, 20 Feb 2016 16:59:00 +0000
Subject: [PATCH] strutil/strutilascii.c: cleanup -Wcast-qual warning
strutilascii.c: In function 'str_ascii_create_search_needle':
strutilascii.c:557:12: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
return (char *) needle;
^
strutilascii.c: In function 'str_ascii_search_first':
strutilascii.c:579:30: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
fold_text = (case_sen) ? (char *) text : g_ascii_strdown (text, -1);
^
strutilascii.c:580:32: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
fold_search = (case_sen) ? (char *) search : g_ascii_strdown (search, -1);
^
strutilascii.c: In function 'str_ascii_search_last':
strutilascii.c:609:30: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
fold_text = (case_sen) ? (char *) text : g_ascii_strdown (text, -1);
^
strutilascii.c:610:32: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
fold_search = (case_sen) ? (char *) search : g_ascii_strdown (search, -1);
^
strutilascii.c: In function 'str_ascii_create_key':
strutilascii.c:677:12: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual]
return (char *) text;
^
Signed-off-by: Andreas Mohr <and@gmx.li>
---
lib/strutil/strutilascii.c | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/lib/strutil/strutilascii.c b/lib/strutil/strutilascii.c
index 66526fb..cf6f279 100644
|
a
|
b
|
static char * |
| 554 | 554 | str_ascii_create_search_needle (const char *needle, int case_sen) |
| 555 | 555 | { |
| 556 | 556 | (void) case_sen; |
| 557 | | return (char *) needle; |
| | 557 | return g_strdup (needle); |
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | /* --------------------------------------------------------------------------------------------- */ |
| … |
… |
static void |
| 563 | 563 | str_ascii_release_search_needle (char *needle, int case_sen) |
| 564 | 564 | { |
| 565 | 565 | (void) case_sen; |
| 566 | | (void) needle; |
| 567 | | |
| | 566 | g_free (needle); |
| 568 | 567 | } |
| 569 | 568 | |
| 570 | 569 | /* --------------------------------------------------------------------------------------------- */ |
| … |
… |
str_ascii_search_first (const char *text, const char *search, int case_sen) |
| 576 | 575 | char *fold_search; |
| 577 | 576 | const char *match; |
| 578 | 577 | |
| 579 | | fold_text = (case_sen) ? (char *) text : g_ascii_strdown (text, -1); |
| 580 | | fold_search = (case_sen) ? (char *) search : g_ascii_strdown (search, -1); |
| | 578 | fold_text = (case_sen) ? g_strdup (text) : g_ascii_strdown (text, -1); |
| | 579 | fold_search = (case_sen) ? g_strdup (search) : g_ascii_strdown (search, -1); |
| 581 | 580 | |
| 582 | 581 | match = g_strstr_len (fold_text, -1, fold_search); |
| 583 | 582 | if (match != NULL) |
| … |
… |
str_ascii_search_first (const char *text, const char *search, int case_sen) |
| 588 | 587 | match = text + offset; |
| 589 | 588 | } |
| 590 | 589 | |
| 591 | | if (!case_sen) |
| 592 | | { |
| 593 | | g_free (fold_text); |
| 594 | | g_free (fold_search); |
| 595 | | } |
| | 590 | g_free (fold_text); |
| | 591 | g_free (fold_search); |
| 596 | 592 | |
| 597 | 593 | return match; |
| 598 | 594 | } |
| … |
… |
str_ascii_search_last (const char *text, const char *search, int case_sen) |
| 606 | 602 | char *fold_search; |
| 607 | 603 | const char *match; |
| 608 | 604 | |
| 609 | | fold_text = (case_sen) ? (char *) text : g_ascii_strdown (text, -1); |
| 610 | | fold_search = (case_sen) ? (char *) search : g_ascii_strdown (search, -1); |
| | 605 | fold_text = (case_sen) ? g_strdup (text) : g_ascii_strdown (text, -1); |
| | 606 | fold_search = (case_sen) ? g_strdup (search) : g_ascii_strdown (search, -1); |
| 611 | 607 | |
| 612 | 608 | match = g_strrstr_len (fold_text, -1, fold_search); |
| 613 | 609 | if (match != NULL) |
| … |
… |
str_ascii_search_last (const char *text, const char *search, int case_sen) |
| 618 | 614 | match = text + offset; |
| 619 | 615 | } |
| 620 | 616 | |
| 621 | | if (!case_sen) |
| 622 | | { |
| 623 | | g_free (fold_text); |
| 624 | | g_free (fold_search); |
| 625 | | } |
| | 617 | g_free (fold_text); |
| | 618 | g_free (fold_search); |
| 626 | 619 | |
| 627 | 620 | return match; |
| 628 | 621 | } |
| … |
… |
static char * |
| 674 | 667 | str_ascii_create_key (const char *text, int case_sen) |
| 675 | 668 | { |
| 676 | 669 | (void) case_sen; |
| 677 | | return (char *) text; |
| | 670 | return g_strdup (text); |
| 678 | 671 | } |
| 679 | 672 | |
| 680 | 673 | /* --------------------------------------------------------------------------------------------- */ |
| … |
… |
str_ascii_key_collate (const char *t1, const char *t2, int case_sen) |
| 690 | 683 | static void |
| 691 | 684 | str_ascii_release_key (char *key, int case_sen) |
| 692 | 685 | { |
| 693 | | (void) key; |
| 694 | 686 | (void) case_sen; |
| | 687 | g_free (key); |
| 695 | 688 | } |
| 696 | 689 | |
| 697 | 690 | /* --------------------------------------------------------------------------------------------- */ |
