diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-09-28 18:02:40 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-09-28 18:02:40 +0300 |
| commit | 6a44dd0f446ad2b17dc6150d910d007c757e266b (patch) | |
| tree | b7be52573e6b22b134bacd5e41bf23481c0d837e | |
| parent | 0b61b4207fb3c00860f8ef4d4b86e31cdc90c09d (diff) | |
Adapt to renaming butl::casecmp() to icasecmp()
| -rw-r--r-- | bdep/http-service.cxx | 6 | ||||
| -rw-r--r-- | bdep/new.cxx | 8 | ||||
| -rw-r--r-- | bdep/utility.hxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/bdep/http-service.cxx b/bdep/http-service.cxx index 6027c9d..892ad82 100644 --- a/bdep/http-service.cxx +++ b/bdep/http-service.cxx @@ -315,7 +315,7 @@ namespace bdep auto header = [&l] (const char* name) -> optional<string> { size_t n (string::traits_type::length (name)); - if (!(casecmp (name, l, n) == 0 && l[n] == ':')) + if (!(icasecmp (name, l, n) == 0 && l[n] == ':')) return nullopt; string r; @@ -364,7 +364,7 @@ namespace bdep if (ctype) { - if (casecmp ("text/manifest", *ctype, 13) == 0) + if (icasecmp ("text/manifest", *ctype, 13) == 0) { parser p (is, "manifest"); name_value nv (p.next ()); @@ -427,7 +427,7 @@ namespace bdep status = c; } - else if (casecmp ("text/plain", *ctype, 10) == 0) + else if (icasecmp ("text/plain", *ctype, 10) == 0) getline (is, message); // Can result in the empty message. } diff --git a/bdep/new.cxx b/bdep/new.cxx index 23bc4bc..c77390f 100644 --- a/bdep/new.cxx +++ b/bdep/new.cxx @@ -27,7 +27,7 @@ namespace bdep { // License id to full name map. // - static const map<string, string, case_compare_string> licenses = { + static const map<string, string, icase_compare_string> licenses = { {"MIT", "MIT License" }, {"BSD2", "Simplified 2-clause BSD License" }, {"BSD3", "New 3-clause BSD License" }, @@ -180,7 +180,7 @@ namespace bdep if (next ()) { - if (casecmp (l, "# " + n) == 0) + if (icasecmp (l, "# " + n) == 0) { if (next ()) { @@ -749,7 +749,7 @@ namespace bdep { if (!license_o) license = *license_e; - else if (casecmp (*license_e, license) != 0) + else if (icasecmp (*license_e, license) != 0) fail << "extracted license does not match requested" << info << "extracted: " << *license_e << info << "requested: " << license; @@ -957,7 +957,7 @@ namespace bdep } else { - if (casecmp (license, "BSD") == 0) + if (icasecmp (license, "BSD") == 0) warn << "BSD license name is ambiguous" << info << "consider using BSD3 for \"New 3-clause BSD License\""; } diff --git a/bdep/utility.hxx b/bdep/utility.hxx index 6121593..3de1c32 100644 --- a/bdep/utility.hxx +++ b/bdep/utility.hxx @@ -14,7 +14,7 @@ #include <libbutl/ft/lang.hxx> -#include <libbutl/utility.mxx> // casecmp(), reverse_iterate(), etc +#include <libbutl/utility.mxx> // icasecmp(), reverse_iterate(), etc #include <libbutl/prompt.mxx> #include <libbutl/fdstream.mxx> #include <libbutl/filesystem.mxx> @@ -45,7 +45,7 @@ namespace bdep // using butl::ucase; using butl::lcase; - using butl::casecmp; + using butl::icasecmp; using butl::trim; using butl::next_word; |