| リビジョン | 70caec1def5d059224ae202674e69346c78e16cf (tree) |
|---|---|
| 日時 | 2013-01-11 16:38:19 |
| 作者 | Takashi Suzuki <suzuki.takashi@metr...> |
| コミッター | Takashi Suzuki |
処理内容が似ている関数(parse_*_parenthesis)を1つにまとめた。
pg_hint_plan.c (diff)| @@ -875,29 +875,17 @@ parse_keyword(const char *str, StringInfo buf) | ||
| 875 | 875 | } |
| 876 | 876 | |
| 877 | 877 | static const char * |
| 878 | -skip_opened_parenthesis(const char *str) | |
| 878 | +skip_parenthesis(const char *str, char parenthesis) | |
| 879 | 879 | { |
| 880 | 880 | skip_space(str); |
| 881 | 881 | |
| 882 | - if (*str != '(') | |
| 882 | + if (*str != parenthesis) | |
| 883 | 883 | { |
| 884 | - hint_ereport(str, ("Opening parenthesis is necessary.")); | |
| 885 | - return NULL; | |
| 886 | - } | |
| 887 | - | |
| 888 | - str++; | |
| 889 | - | |
| 890 | - return str; | |
| 891 | -} | |
| 892 | - | |
| 893 | -static const char * | |
| 894 | -skip_closed_parenthesis(const char *str) | |
| 895 | -{ | |
| 896 | - skip_space(str); | |
| 897 | - | |
| 898 | - if (*str != ')') | |
| 899 | - { | |
| 900 | - hint_ereport(str, ("Closing parenthesis is necessary.")); | |
| 884 | + if (parenthesis == '(') | |
| 885 | + hint_ereport(str, ("Opening parenthesis is necessary.")); | |
| 886 | + else if (parenthesis == ')') | |
| 887 | + hint_ereport(str, ("Closing parenthesis is necessary.")); | |
| 888 | + | |
| 901 | 889 | return NULL; |
| 902 | 890 | } |
| 903 | 891 |
| @@ -990,7 +978,7 @@ parse_parentheses(const char *str, List **name_list, HintType type) | ||
| 990 | 978 | char *name; |
| 991 | 979 | bool truncate = true; |
| 992 | 980 | |
| 993 | - if ((str = skip_opened_parenthesis(str)) == NULL) | |
| 981 | + if ((str = skip_parenthesis(str, '(')) == NULL) | |
| 994 | 982 | return NULL; |
| 995 | 983 | |
| 996 | 984 | skip_space(str); |
| @@ -1013,7 +1001,7 @@ parse_parentheses(const char *str, List **name_list, HintType type) | ||
| 1013 | 1001 | } |
| 1014 | 1002 | } |
| 1015 | 1003 | |
| 1016 | - if ((str = skip_closed_parenthesis(str)) == NULL) | |
| 1004 | + if ((str = skip_parenthesis(str, ')')) == NULL) | |
| 1017 | 1005 | return NULL; |
| 1018 | 1006 | return str; |
| 1019 | 1007 | } |
Fork