X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fexpressions%2Fparse.c;h=15efe00bed59f56a8bddeeee0b3ef6fe374fb8cd;hb=1195caf0c998e80d3e7195a0452a14e7b4194077;hp=7af90feb9b530c40634ae845e3411c89ac2cd7d8;hpb=0e3829dd353c7a7300160d46e81c7435120e16cd;p=pspp-builds.git diff --git a/src/expressions/parse.c b/src/expressions/parse.c index 7af90feb..15efe00b 100644 --- a/src/expressions/parse.c +++ b/src/expressions/parse.c @@ -881,14 +881,14 @@ word_matches (const char **test, const char **name) size_t name_len = strcspn (*name, "."); if (test_len == name_len) { - if (memcmp (*test, *name, test_len)) + if (mm_case_compare (*test, *name, test_len)) return false; } else if (test_len < 3 || test_len > name_len) return false; else { - if (memcmp (*test, *name, test_len)) + if (mm_case_compare (*test, *name, test_len)) return false; } @@ -917,6 +917,12 @@ compare_names (const char *test, const char *name) } } +static int +compare_strings (const char *test, const char *name) +{ + return strcasecmp (test, name); +} + static bool lookup_function_helper (const char *name, int (*compare) (const char *test, const char *name), @@ -947,7 +953,7 @@ lookup_function (const char *name, const struct operation **last) { *first = *last = NULL; - return (lookup_function_helper (name, strcmp, first, last) + return (lookup_function_helper (name, compare_strings, first, last) || lookup_function_helper (name, compare_names, first, last)); } @@ -1273,7 +1279,7 @@ expr_allocate_nullary (struct expression *e, operation_type op) union any_node * expr_allocate_unary (struct expression *e, operation_type op, -union any_node *arg0) + union any_node *arg0) { return expr_allocate_composite (e, op, &arg0, 1); }