pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove ctype patches: Upstream PR has been merged



Module Name:	pkgsrc-wip
Committed By:	atomicules <base%atomicules.co.uk@localhost>
Pushed By:	atomicules
Date:		Sun Dec 7 21:44:31 2025 +0000
Changeset:	1569bc40d86498d34aa527bb4a3920767d84d559

Removed Files:
	ledger/patches/patch-src_amount.cc
	ledger/patches/patch-src_expr.cc
	ledger/patches/patch-src_format.cc
	ledger/patches/patch-src_item.cc
	ledger/patches/patch-src_lookup.cc
	ledger/patches/patch-src_option.cc
	ledger/patches/patch-src_pool.cc
	ledger/patches/patch-src_report.cc
	ledger/patches/patch-src_strptime.cc
	ledger/patches/patch-src_textual.cc
	ledger/patches/patch-src_times.cc
	ledger/patches/patch-src_utils.cc
	ledger/patches/patch-src_xact.cc

Log Message:
Remove ctype patches: Upstream PR has been merged

References: https://github.com/ledger/ledger/pull/2341

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1569bc40d86498d34aa527bb4a3920767d84d559

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ledger/patches/patch-src_amount.cc   |  35 -----------
 ledger/patches/patch-src_expr.cc     |  16 -----
 ledger/patches/patch-src_format.cc   |  78 -------------------------
 ledger/patches/patch-src_item.cc     |  17 ------
 ledger/patches/patch-src_lookup.cc   |  22 -------
 ledger/patches/patch-src_option.cc   |  17 ------
 ledger/patches/patch-src_pool.cc     |  25 --------
 ledger/patches/patch-src_report.cc   |  20 -------
 ledger/patches/patch-src_strptime.cc |  27 ---------
 ledger/patches/patch-src_textual.cc  | 110 -----------------------------------
 ledger/patches/patch-src_times.cc    |  57 ------------------
 ledger/patches/patch-src_utils.cc    |  16 -----
 ledger/patches/patch-src_xact.cc     |  20 -------
 13 files changed, 460 deletions(-)

diffs:
diff --git a/ledger/patches/patch-src_amount.cc b/ledger/patches/patch-src_amount.cc
deleted file mode 100644
index 553860607e..0000000000
--- a/ledger/patches/patch-src_amount.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_amount.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/amount.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/amount.cc
-@@ -983,7 +983,8 @@ namespace {
-               std::isdigit(c) || c == '.' || c == ',');
- 
-     string::size_type len = std::strlen(buf);
--    while (len > 0 && ! std::isdigit(buf[len - 1])) {
-+    while (len > 0 &&
-+           ! std::isdigit(static_cast<unsigned char>(buf[len - 1]))) {
-       buf[--len] = '\0';
-       in.unget();
-     }
-@@ -1018,7 +1019,7 @@ bool amount_t::parse(std::istream& in, c
-     parse_quantity(in, quant);
- 
-     if (! in.eof() && ((n = static_cast<char>(in.peek())) != '\n')) {
--      if (std::isspace(n))
-+      if (std::isspace(static_cast<unsigned char>(n)))
-         comm_flags |= COMMODITY_STYLE_SEPARATED;
- 
-       commodity_t::parse_symbol(in, symbol);
-@@ -1034,7 +1035,7 @@ bool amount_t::parse(std::istream& in, c
-     commodity_t::parse_symbol(in, symbol);
- 
-     if (! in.eof() && ((n = static_cast<char>(in.peek())) != '\n')) {
--      if (std::isspace(static_cast<char>(in.peek())))
-+      if (std::isspace(in.peek()))
-         comm_flags |= COMMODITY_STYLE_SEPARATED;
- 
-       parse_quantity(in, quant);
diff --git a/ledger/patches/patch-src_expr.cc b/ledger/patches/patch-src_expr.cc
deleted file mode 100644
index 222be8a8d4..0000000000
--- a/ledger/patches/patch-src_expr.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_expr.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/expr.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/expr.cc
-@@ -222,7 +222,7 @@ bool merged_expr_t::check_for_single_ide
- {
-   bool single_identifier = true;
-   for (const char * p = expr.c_str(); *p; ++p)
--    if (! std::isalnum(*p) || *p == '_') {
-+    if (! std::isalnum(static_cast<unsigned char>(*p)) || *p == '_') {
-       single_identifier = false;
-       break;
-     }
diff --git a/ledger/patches/patch-src_format.cc b/ledger/patches/patch-src_format.cc
deleted file mode 100644
index 0ec5d8fa0c..0000000000
--- a/ledger/patches/patch-src_format.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_format.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/format.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/format.cc
-@@ -109,7 +109,7 @@ namespace {
- 
-       // Don't gobble up any whitespace
-       const char * base = p;
--      while (p >= base && std::isspace(*p))
-+      while (p >= base && std::isspace(static_cast<unsigned char>(*p)))
-         p--;
-     }
-     return expr;
-@@ -183,7 +183,7 @@ format_t::element_t * format_t::parse_el
-     }
- 
-     std::size_t num = 0;
--    while (*p && std::isdigit(*p)) {
-+    while (*p && std::isdigit(static_cast<unsigned char>(*p))) {
-       num *= 10;
-       num += static_cast<std::size_t>(*p++ - '0');
-     }
-@@ -192,7 +192,7 @@ format_t::element_t * format_t::parse_el
-     if (*p == '.') {
-       ++p;
-       num = 0;
--      while (*p && std::isdigit(*p)) {
-+      while (*p && std::isdigit(static_cast<unsigned char>(*p))) {
-         num *= 10;
-         num += static_cast<std::size_t>(*p++ - '0');
-       }
-@@ -201,7 +201,7 @@ format_t::element_t * format_t::parse_el
-         current->min_width = current->max_width;
-     }
- 
--    if (std::isalpha(*p)) {
-+    if (std::isalpha(static_cast<unsigned char>(*p))) {
-       bool found = false;
-       for (std::size_t i = 0; i < (sizeof(single_letter_mappings) /
-                                    sizeof(format_mapping_t)); i++) {
-@@ -210,7 +210,7 @@ format_t::element_t * format_t::parse_el
-           for (const char * ptr = single_letter_mappings[i].expr; *ptr;) {
-             if (*ptr == '$') {
-               const char * beg = ++ptr;
--              while (*ptr && std::isalpha(*ptr))
-+              while (*ptr && std::isalpha(static_cast<unsigned char>(*ptr)))
-                 ++ptr;
-               string::size_type klen = static_cast<string::size_type>(ptr - beg);
-               string keyword(beg, 0, klen);
-@@ -250,12 +250,13 @@ format_t::element_t * format_t::parse_el
-           throw_(format_error, _("Prior field reference, but no template"));
- 
-         p++;
--        if (*p == '0' || (! std::isdigit(*p) &&
-+        if (*p == '0' || (! std::isdigit(static_cast<unsigned char>(*p)) &&
-                           *p != 'A' && *p != 'B' && *p != 'C' &&
-                           *p != 'D' && *p != 'E' && *p != 'F'))
-           throw_(format_error, _("%$ field reference must be a digit from 1-9"));
- 
--        int         index     = std::isdigit(*p) ? *p - '0' : (*p - 'A' + 10);
-+        int         index     = std::isdigit(static_cast<unsigned char>(*p))
-+          ? *p - '0' : (*p - 'A' + 10);
-         element_t * tmpl_elem = tmpl->elements.get();
- 
-         for (int i = 1; i < index && tmpl_elem; i++) {
-@@ -630,7 +631,8 @@ string format_t::truncate(const unistrin
-           if (adjust > 0) {
-             DEBUG("format.abbrev",
-                   "Reducing segment " << ++index << " by " << adjust << " chars");
--            while (std::isspace((*x)[*i - adjust - 1]) && adjust < *i) {
-+            while (std::isspace(static_cast<unsigned char>(
-+                (*x)[*i - adjust - 1])) && adjust < *i) {
-               DEBUG("format.abbrev",
-                     "Segment ends in whitespace, adjusting down");
-               ++adjust;
diff --git a/ledger/patches/patch-src_item.cc b/ledger/patches/patch-src_item.cc
deleted file mode 100644
index 060ffe07b1..0000000000
--- a/ledger/patches/patch-src_item.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_item.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/item.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/item.cc
-@@ -151,7 +151,8 @@ void item_t::parse_tags(const char * p,
-   if (! std::strchr(p, ':')) {
-     if (const char * b = std::strchr(p, '[')) {
-       if (*(b + 1) != '\0' &&
--          (std::isdigit(*(b + 1)) || *(b + 1) == '=')) {
-+          (std::isdigit(static_cast<unsigned char>(*(b + 1))) ||
-+           *(b + 1) == '=')) {
-         if (const char * e = std::strchr(b, ']')) {
-           char buf[256];
-           std::strncpy(buf, b + 1, static_cast<std::size_t>(e - b - 1));
diff --git a/ledger/patches/patch-src_lookup.cc b/ledger/patches/patch-src_lookup.cc
deleted file mode 100644
index 4f506abdcd..0000000000
--- a/ledger/patches/patch-src_lookup.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_lookup.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/lookup.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/lookup.cc
-@@ -188,7 +188,13 @@ lookup_probable_account(const string& id
- 
- #if 0
- #if !HAVE_BOOST_REGEX_UNICODE
--          if (pos == 0 || (pos > 0 && !std::isalnum(value_key[pos - 1])))
-+          // Probably doesn't make sense with value_key as unistring,
-+          // but this code is under #if 0 anyway, so if anyone is
-+          // tempted to use this by changing value_key to string, let's
-+          // avoid leaving a rake to step on.
-+          if (pos == 0 ||
-+              (pos > 0 &&
-+               !std::isalnum(static_cast<unsigned char>(value_key[pos - 1]))))
-             addend++;
- #else
-           // jww (2010-03-07): Not yet implemented
diff --git a/ledger/patches/patch-src_option.cc b/ledger/patches/patch-src_option.cc
deleted file mode 100644
index 38f9a6d79b..0000000000
--- a/ledger/patches/patch-src_option.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_option.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/option.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/option.cc
-@@ -132,7 +132,8 @@ void process_environment(const char ** e
-         if (*q == '_')
-           *r++ = '-';
-         else
--          *r++ = static_cast<char>(std::tolower(*q));
-+          *r++ = static_cast<char>(std::tolower(
-+            static_cast<unsigned char>(*q)));
-       *r = '\0';
- 
-       if (*q == '=') {
diff --git a/ledger/patches/patch-src_pool.cc b/ledger/patches/patch-src_pool.cc
deleted file mode 100644
index 6dbe32db7a..0000000000
--- a/ledger/patches/patch-src_pool.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_pool.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/pool.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/pool.cc
-@@ -327,13 +327,15 @@ commodity_pool_t::parse_price_directive
-   datetime_t datetime;
-   string     symbol;
- 
--  if (! no_date && std::isdigit(time_field_ptr[0])) {
-+  if (! no_date &&
-+      std::isdigit(static_cast<unsigned char>(time_field_ptr[0]))) {
-     symbol_and_price = next_element(time_field_ptr);
-     if (! symbol_and_price) return none;
- 
-     datetime = parse_datetime(date_field + " " + time_field_ptr);
-   }
--  else if (! no_date && std::isdigit(date_field_ptr[0])) {
-+  else if (! no_date &&
-+           std::isdigit(static_cast<unsigned char>(date_field_ptr[0]))) {
-     symbol_and_price = time_field_ptr;
-     datetime = datetime_t(parse_date(date_field));
-   }
diff --git a/ledger/patches/patch-src_report.cc b/ledger/patches/patch-src_report.cc
deleted file mode 100644
index 1755317040..0000000000
--- a/ledger/patches/patch-src_report.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_report.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/report.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/report.cc
-@@ -642,10 +642,10 @@ value_t report_t::fn_trim(call_scope_t& 
-   const char * p = buf.get();
-   const char * e = buf.get() + temp.length() - 1;
- 
--  while (p <= e && std::isspace(*p))
-+  while (p <= e && std::isspace(static_cast<unsigned char>(*p)))
-     p++;
- 
--  while (e > p && std::isspace(*e))
-+  while (e > p && std::isspace(static_cast<unsigned char>(*e)))
-     e--;
- 
-   if (p > e) {
diff --git a/ledger/patches/patch-src_strptime.cc b/ledger/patches/patch-src_strptime.cc
deleted file mode 100644
index 60c931f1ba..0000000000
--- a/ledger/patches/patch-src_strptime.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_strptime.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/strptime.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/strptime.cc
-@@ -62,7 +62,9 @@ static const char* kMonthAbbr[] = {
- 
- static const char* _parse_num(const char* s, int low, int high, int* value) {
-   const char* p = s;
--  for (*value = 0; *p != NULL && isdigit(*p); ++p) {
-+  for (*value = 0;
-+       *p != NULL && isdigit(static_cast<unsigned char>(*p));
-+       ++p) {
-     *value = (*value) * 10 + static_cast<int>(*p) - static_cast<int>('0');
-   }
- 
-@@ -177,7 +179,7 @@ static char* _strptime(const char *s, co
-       // arbitrary whitespace.
-       case 't':
-       case 'n':
--        while (isspace(*s)) ++s;
-+        while (isspace(static_cast<unsigned char>(*s))) ++s;
-         break;
- 
-       // '%'.
diff --git a/ledger/patches/patch-src_textual.cc b/ledger/patches/patch-src_textual.cc
deleted file mode 100644
index 588270c523..0000000000
--- a/ledger/patches/patch-src_textual.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-src_textual.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/textual.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/textual.cc
-@@ -340,7 +340,8 @@ std::streamsize instance_t::read_line(ch
-         --len;
-     }
- 
--    while (len > 0 && std::isspace(line[len - 1])) // strip trailing whitespace
-+    // strip trailing whitespace
-+    while (len > 0 && std::isspace(static_cast<unsigned char>(line[len - 1])))
-       line[--len] = '\0';
- 
-     return len;
-@@ -355,7 +356,7 @@ void instance_t::read_next_directive(boo
-   if (len == 0 || line == NULL)
-     return;
- 
--  if (! std::isspace(line[0]))
-+  if (! std::isspace(static_cast<unsigned char>(line[0])))
-     error_flag = false;
- 
-   switch (line[0]) {
-@@ -615,12 +616,16 @@ void instance_t::automated_xact_directiv
-         item->pos->end_line++;
-       }
-       else if ((remlen > 7 && *p == 'a' &&
--                std::strncmp(p, "assert", 6) == 0 && std::isspace(p[6])) ||
-+                std::strncmp(p, "assert", 6) == 0 &&
-+                std::isspace(static_cast<unsigned char>(p[6]))) ||
-                (remlen > 6 && *p == 'c' &&
--                std::strncmp(p, "check", 5) == 0 && std::isspace(p[5])) ||
-+                std::strncmp(p, "check", 5) == 0 &&
-+                std::isspace(static_cast<unsigned char>(p[5]))) ||
-                (remlen > 5 && *p == 'e' &&
--                ((std::strncmp(p, "expr", 4) == 0 && std::isspace(p[4])) ||
--                 (std::strncmp(p, "eval", 4) == 0 && std::isspace(p[4]))))) {
-+                ((std::strncmp(p, "expr", 4) == 0 &&
-+                  std::isspace(static_cast<unsigned char>(p[4]))) ||
-+                 (std::strncmp(p, "eval", 4) == 0 &&
-+                  std::isspace(static_cast<unsigned char>(p[4])))))) {
-         const char c = *p;
-         p = skip_ws(&p[*p == 'a' ? 6 : (*p == 'c' ? 5 : 4)]);
-         if (! ae->check_exprs)
-@@ -1015,7 +1020,7 @@ void instance_t::alias_directive(char * 
- {
-   if (char * e = std::strchr(line, '=')) {
-     char * z = e - 1;
--    while (std::isspace(*z))
-+    while (std::isspace(static_cast<unsigned char>(*z)))
-       *z-- = '\0';
-     *e++ = '\0';
-     e = skip_ws(e);
-@@ -1234,7 +1239,7 @@ void instance_t::python_directive(char *
-     if (read_line(line) > 0) {
-       if (! indent) {
-         const char * p = line;
--        while (*p && std::isspace(*p)) {
-+        while (*p && std::isspace(static_cast<unsigned char>(*p))) {
-           ++indent;
-           ++p;
-         }
-@@ -1242,7 +1247,7 @@ void instance_t::python_directive(char *
- 
-       const char * p = line;
-       for (std::size_t i = 0; i < indent; i++) {
--        if (std::isspace(*p))
-+        if (std::isspace(static_cast<unsigned char>(*p)))
-           ++p;
-         else
-           break;
-@@ -1473,7 +1478,7 @@ post_t * instance_t::parse_post(char *  
-   char * next = next_element(p, true);
-   char * e = p + std::strlen(p);
- 
--  while (e > p && std::isspace(*(e - 1)))
-+  while (e > p && std::isspace(static_cast<unsigned char>(*(e - 1))))
-     e--;
- 
-   if ((*p == '[' && *(e - 1) == ']') || (*p == '(' && *(e - 1) == ')')) {
-@@ -1884,7 +1889,7 @@ xact_t * instance_t::parse_xact(char *  
-       }
-       else if (*p == ';' && (tabs > 0 || spaces > 1)) {
-         char *q = p - 1;
--        while (q > next && std::isspace(*q))
-+        while (q > next && std::isspace(static_cast<unsigned char>(*q)))
-           --q;
-         if (q >= next)
-           *(q + 1) = '\0';
-@@ -1937,11 +1942,14 @@ xact_t * instance_t::parse_xact(char *  
-       item->pos->end_line++;
-     }
-     else if ((remlen > 7 && *p == 'a' &&
--              std::strncmp(p, "assert", 6) == 0 && std::isspace(p[6])) ||
-+              std::strncmp(p, "assert", 6) == 0 &&
-+              std::isspace(static_cast<unsigned char>(p[6]))) ||
-              (remlen > 6 && *p == 'c' &&
--              std::strncmp(p, "check", 5) == 0 && std::isspace(p[5])) ||
-+              std::strncmp(p, "check", 5) == 0 &&
-+              std::isspace(static_cast<unsigned char>(p[5]))) ||
-              (remlen > 5 && *p == 'e' &&
--              std::strncmp(p, "expr", 4) == 0 && std::isspace(p[4]))) {
-+              std::strncmp(p, "expr", 4) == 0 &&
-+              std::isspace(static_cast<unsigned char>(p[4])))) {
-       const char c = *p;
-       p = skip_ws(&p[*p == 'a' ? 6 : (*p == 'c' ? 5 : 4)]);
-       expr_t expr(p);
diff --git a/ledger/patches/patch-src_times.cc b/ledger/patches/patch-src_times.cc
deleted file mode 100644
index 3231133a64..0000000000
--- a/ledger/patches/patch-src_times.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-src_times.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/times.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/times.cc
-@@ -1467,7 +1467,7 @@ date_parser_t::lexer_t::token_t date_par
-     return tok;
-   }
- 
--  while (begin != end && std::isspace(*begin))
-+  while (begin != end && std::isspace(static_cast<unsigned char>(*begin)))
-     begin++;
- 
-   if (begin == end)
-@@ -1486,9 +1486,11 @@ date_parser_t::lexer_t::token_t date_par
-   // date using the typical date formats.  This allows not only dates like
-   // "2009/08/01", but also dates that fit the user's --input-date-format,
-   // assuming their format fits in one argument and begins with a digit.
--  if (std::isdigit(*begin)) {
-+  if (std::isdigit(static_cast<unsigned char>(*begin))) {
-     string::const_iterator i = begin;
--    for (i = begin; i != end && ! std::isspace(*i); i++) {}
-+    for (i = begin;
-+         i != end && ! std::isspace(static_cast<unsigned char>(*i));
-+         i++) {}
-     assert(i != begin);
- 
-     string possible_date(start, i);
-@@ -1513,18 +1515,20 @@ date_parser_t::lexer_t::token_t date_par
-   start = begin;
- 
-   string term;
--  bool alnum = std::isalnum(*begin);
--  for (; (begin != end && ! std::isspace(*begin) &&
--          ((alnum && static_cast<bool>(std::isalnum(*begin))) ||
--           (! alnum && ! static_cast<bool>(std::isalnum(*begin))))); begin++)
-+  bool alnum = std::isalnum(static_cast<unsigned char>(*begin));
-+  for (; (begin != end && ! std::isspace(static_cast<unsigned char>(*begin)) &&
-+          ((alnum && static_cast<bool>(std::isalnum(
-+             static_cast<unsigned char>(*begin)))) ||
-+           (! alnum && ! static_cast<bool>(std::isalnum(
-+             static_cast<unsigned char>(*begin)))))); begin++)
-     term.push_back(*begin);
- 
-   if (! term.empty()) {
--    if (std::isdigit(term[0])) {
-+    if (std::isdigit(static_cast<unsigned char>(term[0]))) {
-       return token_t(token_t::TOK_INT,
-                      token_t::content_t(lexical_cast<unsigned short>(term)));
-     }
--    else if (std::isalpha(term[0])) {
-+    else if (std::isalpha(static_cast<unsigned char>(term[0]))) {
-       to_lower(term);
- 
-       if (optional<date_time::months_of_year> month =
diff --git a/ledger/patches/patch-src_utils.cc b/ledger/patches/patch-src_utils.cc
deleted file mode 100644
index 72311d70f6..0000000000
--- a/ledger/patches/patch-src_utils.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_utils.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/utils.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/utils.cc
-@@ -516,7 +516,7 @@ strings_list split_arguments(const char 
-   char in_quoted_string = '\0';
- 
-   for (const char * p = line; *p; p++) {
--    if (! in_quoted_string && std::isspace(*p)) {
-+    if (! in_quoted_string && std::isspace(static_cast<unsigned char>(*p))) {
-       if (q != buf) {
-         *q = '\0';
-         args.push_back(buf);
diff --git a/ledger/patches/patch-src_xact.cc b/ledger/patches/patch-src_xact.cc
deleted file mode 100644
index 1cecdf3bcb..0000000000
--- a/ledger/patches/patch-src_xact.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_xact.cc,v 1.1 2024/05/02 13:27:04 riastradh Exp $
-
-Fix ctype abuse.
-https://github.com/ledger/ledger/pull/2341
-
---- src/xact.cc.orig	2023-03-30 07:40:48.000000000 +0000
-+++ src/xact.cc
-@@ -116,8 +116,10 @@ value_t xact_base_t::magnitude() const
- namespace {
-   inline bool account_ends_with_special_char(const string& name) {
-     string::size_type len(name.length());
--    return (std::isdigit(name[len - 1]) || name[len - 1] == ')' ||
--            name[len - 1] == '}' || name[len - 1] == ']');
-+    return (std::isdigit(static_cast<unsigned char>(name[len - 1])) ||
-+            name[len - 1] == ')' ||
-+            name[len - 1] == '}' ||
-+            name[len - 1] == ']');
-   }
- 
-   struct add_balancing_post


Home | Main Index | Thread Index | Old Index