[libvirt] [PATCH v2 00/14] drop usage of c-type gnulib module
Changes in v2: - fixed missing parentheses in patch 01 - added patch 02 to cover c_isascii Pavel Hrdina (14): util: define IS_BLANK instead of using c_isblank from gnulib virkeyfile: define IS_ASCII instead c_isascii from gnulib use g_ascii_isalnum instead of c_isalnum from gnulib use g_ascii_isalpha instead of c_isalpha from gnulib use g_ascii_iscntrl instead of c_iscntrl from gnulib use g_ascii_isdigit instead of c_isdigit frum gnulib use g_ascii_islower instead of c_islower from gnulib use g_ascii_isprint instead of c_isprint from gnulib use g_ascii_isspace instead of c_isspace from gnulib use g_ascii_isxdigit instead of c_isxdigit from gnulib use g_ascii_tolower instead of c_tolower from gnulib use g_ascii_toupper instead of c_toupper from gnulib syntax-check: update c-type checks to refer to Glib bootstrap.conf: drop usage of c-type gnulib module bootstrap.conf | 1 - build-aux/syntax-check.mk | 11 ++--------- src/bhyve/bhyve_parse_command.c | 3 +-- src/conf/network_conf.c | 3 +-- src/conf/nwfilter_conf.c | 3 +-- src/interface/interface_backend_udev.c | 5 ++--- src/libxl/libxl_conf.c | 3 +-- src/node_device/node_device_udev.c | 3 +-- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_monitor.c | 3 +-- src/qemu/qemu_qapi.c | 4 +--- src/remote/remote_driver.c | 3 +-- src/rpc/virnetsocket.c | 3 +-- src/storage/parthelper.c | 5 ++--- src/util/virbitmap.c | 5 ++--- src/util/virconf.c | 18 +++++++++--------- src/util/virfile.c | 8 +++----- src/util/virhostcpu.c | 7 +++---- src/util/virkeyfile.c | 13 +++++++------ src/util/virmacaddr.c | 11 +++++------ src/util/virnetdevvportprofile.c | 3 +-- src/util/virpidfile.c | 3 +-- src/util/virstoragefile.c | 3 +-- src/util/virstring.c | 13 ++++++------- src/util/virutil.c | 11 +++++------ src/util/viruuid.c | 9 ++++----- src/vmx/vmx.c | 8 +++----- tools/virsh-console.c | 3 +-- tools/virsh-domain.c | 3 +-- tools/vsh-table.c | 5 ++--- tools/vsh.c | 5 ++--- 32 files changed, 73 insertions(+), 111 deletions(-) -- 2.23.0
The same way how we have IS_EOL in two files where we actually need it defince IS_BLANK so we can drop usage of c_isblank. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virconf.c | 7 ++++--- src/util/virkeyfile.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index cc88000387..42c847f999 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -56,13 +56,14 @@ struct _virConfParserCtxt { #define CUR (*ctxt->cur) #define NEXT if (ctxt->cur < ctxt->end) ctxt->cur++; #define IS_EOL(c) (((c) == '\n') || ((c) == '\r')) +#define IS_BLANK(c) (((c) == ' ') || ((c) == '\t')) #define SKIP_BLANKS_AND_EOL \ - do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR) || IS_EOL(CUR))) { \ + do { while ((ctxt->cur < ctxt->end) && (IS_BLANK(CUR) || IS_EOL(CUR))) { \ if (CUR == '\n') ctxt->line++; \ ctxt->cur++; } } while (0) #define SKIP_BLANKS \ - do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR))) \ + do { while ((ctxt->cur < ctxt->end) && (IS_BLANK(CUR))) \ ctxt->cur++; } while (0) VIR_ENUM_IMPL(virConf, @@ -428,7 +429,7 @@ virConfParseString(virConfParserCtxtPtr ctxt) while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; /* Reverse to exclude the trailing blanks from the value */ - while ((ctxt->cur > base) && (c_isblank(CUR))) + while ((ctxt->cur > base) && (IS_BLANK(CUR))) ctxt->cur--; if (VIR_STRNDUP(ret, base, ctxt->cur - base) < 0) return NULL; diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index c7e756d26a..6cd3a5168e 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -77,6 +77,7 @@ struct _virKeyFileParserCtxt { #define IS_EOF (ctxt->cur >= ctxt->end) #define IS_EOL(c) (((c) == '\n') || ((c) == '\r')) +#define IS_BLANK(c) (((c) == ' ') || ((c) == '\t')) #define CUR (*ctxt->cur) #define NEXT if (!IS_EOF) ctxt->cur++; @@ -205,7 +206,7 @@ static int virKeyFileParseComment(virKeyFileParserCtxtPtr ctxt) static int virKeyFileParseBlank(virKeyFileParserCtxtPtr ctxt) { - while ((ctxt->cur < ctxt->end) && c_isblank(CUR)) + while ((ctxt->cur < ctxt->end) && IS_BLANK(CUR)) ctxt->cur++; if (!((ctxt->cur == ctxt->end) || IS_EOL(CUR))) { @@ -226,7 +227,7 @@ static int virKeyFileParseStatement(virKeyFileParserCtxtPtr ctxt) ret = virKeyFileParseValue(ctxt); } else if (CUR == '#' || CUR == ';') { ret = virKeyFileParseComment(ctxt); - } else if (c_isblank(CUR) || IS_EOL(CUR)) { + } else if (IS_BLANK(CUR) || IS_EOL(CUR)) { ret = virKeyFileParseBlank(ctxt); } else { virKeyFileError(ctxt, VIR_ERR_CONF_SYNTAX, "unexpected statement"); -- 2.23.0
GLib doesn't provide alternative to c_isascii and this is the only usage of that macro so define a replacement ourselves. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virkeyfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 6cd3a5168e..054a187ba2 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -21,7 +21,6 @@ #include <config.h> -#include "c-ctype.h" #include "virlog.h" #include "viralloc.h" #include "virfile.h" @@ -78,6 +77,7 @@ struct _virKeyFileParserCtxt { #define IS_EOF (ctxt->cur >= ctxt->end) #define IS_EOL(c) (((c) == '\n') || ((c) == '\r')) #define IS_BLANK(c) (((c) == ' ') || ((c) == '\t')) +#define IS_ASCII(c) ((c) < 128) #define CUR (*ctxt->cur) #define NEXT if (!IS_EOF) ctxt->cur++; @@ -110,7 +110,7 @@ static int virKeyFileParseGroup(virKeyFileParserCtxtPtr ctxt) VIR_FREE(ctxt->groupname); name = ctxt->cur; - while (!IS_EOF && c_isascii(CUR) && CUR != ']') + while (!IS_EOF && IS_ASCII(CUR) && CUR != ']') ctxt->cur++; if (CUR != ']') { virKeyFileError(ctxt, VIR_ERR_CONF_SYNTAX, "cannot find end of group name, expected ']'"); -- 2.23.0
On 11/20/19 9:48 AM, Pavel Hrdina wrote:
GLib doesn't provide alternative to c_isascii and this is the only usage of that macro so define a replacement ourselves.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virkeyfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 6cd3a5168e..054a187ba2 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -21,7 +21,6 @@ #include <config.h>
-#include "c-ctype.h" #include "virlog.h" #include "viralloc.h" #include "virfile.h"
This removal needs to go in the next patch otherwise compilation fails here - Cole
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/node_device/node_device_udev.c | 3 +-- src/util/virconf.c | 2 +- src/util/virkeyfile.c | 4 ++-- tools/vsh.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index fabd2ec454..cae00dc9dc 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -22,7 +22,6 @@ #include <libudev.h> #include <pciaccess.h> #include <scsi/scsi.h> -#include <c-ctype.h> #include "dirname.h" #include "node_device_conf.h" @@ -307,7 +306,7 @@ udevGenerateDeviceName(struct udev_device *device, def->name = virBufferContentAndReset(&buf); for (i = 0; i < strlen(def->name); i++) { - if (!(c_isalnum(*(def->name + i)))) + if (!(g_ascii_isalnum(*(def->name + i)))) *(def->name + i) = '_'; } diff --git a/src/util/virconf.c b/src/util/virconf.c index 42c847f999..b67716b9ce 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -562,7 +562,7 @@ virConfParseName(virConfParserCtxtPtr ctxt) return NULL; } while ((ctxt->cur < ctxt->end) && - (c_isalnum(CUR) || (CUR == '_') || + (g_ascii_isalnum(CUR) || (CUR == '_') || ((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && ((CUR == ':') || (CUR == '.') || (CUR == '-'))) || ((ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT) && diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 054a187ba2..e50a37d3a7 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -154,7 +154,7 @@ static int virKeyFileParseValue(virKeyFileParserCtxtPtr ctxt) } keystart = ctxt->cur; - while (!IS_EOF && c_isalnum(CUR) && CUR != '=') + while (!IS_EOF && g_ascii_isalnum(CUR) && CUR != '=') ctxt->cur++; if (CUR != '=') { virKeyFileError(ctxt, VIR_ERR_CONF_SYNTAX, "expected end of value name, expected '='"); @@ -223,7 +223,7 @@ static int virKeyFileParseStatement(virKeyFileParserCtxtPtr ctxt) if (CUR == '[') { ret = virKeyFileParseGroup(ctxt); - } else if (c_isalnum(CUR)) { + } else if (g_ascii_isalnum(CUR)) { ret = virKeyFileParseValue(ctxt); } else if (CUR == '#' || CUR == ';') { ret = virKeyFileParseComment(ctxt); diff --git a/tools/vsh.c b/tools/vsh.c index 1076c8254b..beee1c2986 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1444,7 +1444,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } else if (data_only) { goto get_data; } else if (tkdata[0] == '-' && tkdata[1] == '-' && - c_isalnum(tkdata[2])) { + g_ascii_isalnum(tkdata[2])) { char *optstr = strchr(tkdata + 2, '='); size_t opt_index = 0; -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/conf/network_conf.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_qapi.c | 4 +--- src/util/virconf.c | 2 +- src/util/virfile.c | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6970831593..5551b5b4d5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -37,7 +37,6 @@ #include "virxml.h" #include "viruuid.h" #include "virbuffer.h" -#include "c-ctype.h" #include "virfile.h" #include "virstring.h" @@ -482,7 +481,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, } name = virXMLPropString(node, "name"); - if (name && (!c_isalpha(name[0]))) { + if (name && (!g_ascii_isalpha(name[0]))) { virReportError(VIR_ERR_XML_ERROR, _("Cannot use host name '%s' in network '%s'"), name, networkName); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f54b9b21ff..5eea0ebcd7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -40,7 +40,6 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "c-ctype.h" #include "cpu/cpu.h" #include "viruuid.h" #include "virfile.h" @@ -3768,7 +3767,7 @@ qemuDomainDefNamespaceParseCommandlineArgs(qemuDomainXmlNsDefPtr nsdef, static int qemuDomainDefNamespaceParseCommandlineEnvNameValidate(const char *envname) { - if (!c_isalpha(envname[0]) && envname[0] != '_') { + if (!g_ascii_isalpha(envname[0]) && envname[0] != '_') { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid environment name, it must begin with a letter or underscore")); return -1; diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 484f274c63..15a85fd1ad 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -25,8 +25,6 @@ #include "virerror.h" #include "virlog.h" -#include "c-ctype.h" - #define VIR_FROM_THIS VIR_FROM_QEMU VIR_LOG_INIT("qemu.qemu_qapi"); @@ -165,7 +163,7 @@ virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur, const char *query = virQEMUQAPISchemaTraverseContextNextQuery(ctxt); char modifier = *query; - if (!c_isalpha(modifier)) + if (!g_ascii_isalpha(modifier)) query++; /* exit on modifers for other types */ diff --git a/src/util/virconf.c b/src/util/virconf.c index b67716b9ce..a9a7148701 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -556,7 +556,7 @@ virConfParseName(virConfParserCtxtPtr ctxt) SKIP_BLANKS; base = ctxt->cur; /* TODO: probably need encoding support and UTF-8 parsing ! */ - if (!c_isalpha(CUR) && + if (!g_ascii_isalpha(CUR) && !((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && (CUR == '.'))) { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a name")); return NULL; diff --git a/src/util/virfile.c b/src/util/virfile.c index fca7ff9d35..a329f2e83f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3190,7 +3190,7 @@ virFileIsAbsPath(const char *path) return true; #ifdef WIN32 - if (c_isalpha(path[0]) && + if (g_ascii_isalpha(path[0]) && path[1] == ':' && VIR_FILE_IS_DIR_SEPARATOR(path[2])) return true; @@ -3242,7 +3242,7 @@ virFileSkipRoot(const char *path) #ifdef WIN32 /* Skip X:\ */ - if (c_isalpha(path[0]) && + if (g_ascii_isalpha(path[0]) && path[1] == ':' && VIR_FILE_IS_DIR_SEPARATOR(path[2])) return path + 3; -- 2.23.0
On 11/20/19 9:48 AM, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/conf/network_conf.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_qapi.c | 4 +--- src/util/virconf.c | 2 +- src/util/virfile.c | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-)
There's a new usage in qemu-qapi.c - Cole
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- tools/vsh-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh-table.c b/tools/vsh-table.c index 9008b0d431..28072c9719 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -226,7 +226,7 @@ vshTableSafeEncode(const char *s, size_t *width) while (p && *p) { if ((*p == '\\' && *(p + 1) == 'x') || - c_iscntrl(*p)) { + g_ascii_iscntrl(*p)) { g_snprintf(buf, HEX_ENCODE_LENGTH + 1, "\\x%02x", *p); buf += HEX_ENCODE_LENGTH; *width += HEX_ENCODE_LENGTH; -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_conf.c | 3 +-- src/storage/parthelper.c | 5 ++--- src/util/virbitmap.c | 5 ++--- src/util/virconf.c | 7 +++---- src/util/virfile.c | 4 +--- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index b7b06ed67a..29d91d3539 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -567,7 +567,7 @@ udevBridgeScanDirFilter(const struct dirent *entry) */ if (strlen(entry->d_name) >= 5) { if (STRPREFIX(entry->d_name, VIR_NET_GENERATED_TAP_PREFIX) && - c_isdigit(entry->d_name[4])) + g_ascii_isdigit(entry->d_name[4])) return 0; } diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6e4e6f5c90..1097b7a417 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -29,7 +29,6 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "c-ctype.h" #include "datatypes.h" #include "virconf.h" #include "virfile.h" @@ -1860,7 +1859,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfigPtr cfg, char *p = mem_tokens[j] + 4; unsigned long long multiplier = 1; - while (c_isdigit(*p)) + while (g_ascii_isdigit(*p)) p++; if (virStrToLong_ull(mem_tokens[j] + 4, &p, 10, maxmem) < 0) break; diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index f1a8cc01ea..761a7f93fc 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -38,7 +38,6 @@ #include "virutil.h" #include "virfile.h" -#include "c-ctype.h" #include "virstring.h" #include "virgettext.h" @@ -87,7 +86,7 @@ int main(int argc, char **argv) * path, then append the "p" partition separator. Otherwise, if * the path ends with a letter already, then no need for a separator. */ - if (c_isdigit(path[strlen(path)-1]) || devmap_partsep) + if (g_ascii_isdigit(path[strlen(path)-1]) || devmap_partsep) partsep = "p"; else partsep = ""; @@ -97,7 +96,7 @@ int main(int argc, char **argv) return 2; partsep = *canonical_path && - c_isdigit(canonical_path[strlen(canonical_path)-1]) ? "p" : ""; + g_ascii_isdigit(canonical_path[strlen(canonical_path)-1]) ? "p" : ""; } if ((dev = ped_device_get(path)) == NULL) { diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 9bdb785025..15addee2e9 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -26,7 +26,6 @@ #include "virbitmap.h" #include "viralloc.h" #include "virbuffer.h" -#include "c-ctype.h" #include "virstring.h" #include "virutil.h" #include "virerror.h" @@ -506,7 +505,7 @@ virBitmapParseSeparator(const char *str, neg = true; } - if (!c_isdigit(*cur)) + if (!g_ascii_isdigit(*cur)) goto error; if (virStrToLong_i(cur, &tmp, 10, &start) < 0) @@ -642,7 +641,7 @@ virBitmapParseUnlimited(const char *str) neg = true; } - if (!c_isdigit(*cur)) + if (!g_ascii_isdigit(*cur)) goto error; if (virStrToLong_i(cur, &tmp, 10, &start) < 0) diff --git a/src/util/virconf.c b/src/util/virconf.c index a9a7148701..3b45436499 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -29,7 +29,6 @@ #include "virbuffer.h" #include "virconf.h" #include "virutil.h" -#include "c-ctype.h" #include "virlog.h" #include "viralloc.h" #include "virfile.h" @@ -350,11 +349,11 @@ virConfParseLong(virConfParserCtxtPtr ctxt, long long *val) } else if (CUR == '+') { NEXT; } - if ((ctxt->cur >= ctxt->end) || (!c_isdigit(CUR))) { + if ((ctxt->cur >= ctxt->end) || (!g_ascii_isdigit(CUR))) { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated number")); return -1; } - while ((ctxt->cur < ctxt->end) && (c_isdigit(CUR))) { + while ((ctxt->cur < ctxt->end) && (g_ascii_isdigit(CUR))) { l = l * 10 + (CUR - '0'); NEXT; } @@ -514,7 +513,7 @@ virConfParseValue(virConfParserCtxtPtr ctxt) virConfFreeList(lst); return NULL; } - } else if (c_isdigit(CUR) || (CUR == '-') || (CUR == '+')) { + } else if (g_ascii_isdigit(CUR) || (CUR == '-') || (CUR == '+')) { if (ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("numbers not allowed in VMX format")); diff --git a/src/util/virfile.c b/src/util/virfile.c index a329f2e83f..74e1339855 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -80,8 +80,6 @@ #include "virstring.h" #include "virutil.h" -#include "c-ctype.h" - #define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("util.file"); @@ -696,7 +694,7 @@ static int virFileLoopDeviceOpenSearch(char **dev_name) * new kernels have a dev named 'loop-control' */ if (!STRPREFIX(de->d_name, "loop") || - !c_isdigit(de->d_name[4])) + !g_ascii_isdigit(de->d_name[4])) continue; looppath = g_strdup_printf("/dev/%s", de->d_name); -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index f965bb0e5d..f3cf494353 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -393,11 +393,11 @@ int virDiskNameParse(const char *name, int *disk, int *partition) } } - if (!ptr || !c_islower(*ptr)) + if (!ptr || !g_ascii_islower(*ptr)) return -1; for (i = 0; *ptr; i++) { - if (!c_islower(*ptr)) + if (!g_ascii_islower(*ptr)) break; idx = (idx + (i < 1 ? 0 : 1)) * 26; -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_monitor.c | 3 +-- src/util/virstring.c | 4 ++-- tools/vsh-table.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index e6add56cd6..5fa8d24a91 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -146,7 +146,6 @@ VIR_ONCE_GLOBAL_INIT(qemuAgent); #if DEBUG_RAW_IO -# include <c-ctype.h> static char * qemuAgentEscapeNonPrintable(const char *text) { @@ -155,7 +154,7 @@ qemuAgentEscapeNonPrintable(const char *text) for (i = 0; text[i] != '\0'; i++) { if (text[i] == '\\') virBufferAddLit(&buf, "\\\\"); - else if (c_isprint(text[i]) || text[i] == '\n' || + else if (g_ascii_isprint(text[i]) || text[i] == '\n' || (text[i] == '\r' && text[i+1] == '\n')) virBufferAddChar(&buf, text[i]); else diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index cdad5c955d..ae649108d7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -199,14 +199,13 @@ VIR_ENUM_IMPL(qemuMonitorDumpStatus, #if DEBUG_RAW_IO -# include <c-ctype.h> static char * qemuMonitorEscapeNonPrintable(const char *text) { size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; for (i = 0; text[i] != '\0'; i++) { - if (c_isprint(text[i]) || + if (g_ascii_isprint(text[i]) || text[i] == '\n' || (text[i] == '\r' && text[i + 1] == '\n')) virBufferAddChar(&buf, text[i]); diff --git a/src/util/virstring.c b/src/util/virstring.c index 40c83841e9..a66b406298 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1350,7 +1350,7 @@ virStringIsPrintable(const char *str) size_t i; for (i = 0; str[i]; i++) - if (!c_isprint(str[i])) + if (!g_ascii_isprint(str[i])) return false; return true; @@ -1369,7 +1369,7 @@ virStringBufferIsPrintable(const uint8_t *buf, size_t i; for (i = 0; i < buflen; i++) - if (!c_isprint(buf[i])) + if (!g_ascii_isprint(buf[i])) return false; return true; diff --git a/tools/vsh-table.c b/tools/vsh-table.c index 28072c9719..a2365b2c32 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -25,7 +25,6 @@ #include <stddef.h> #include <wchar.h> #include <wctype.h> -#include "c-ctype.h" #include "viralloc.h" #include "virbuffer.h" @@ -244,7 +243,7 @@ vshTableSafeEncode(const char *s, size_t *width) * Not valid multibyte sequence -- maybe it's * printable char according to the current locales. */ - if (!c_isprint(*p)) { + if (!g_ascii_isprint(*p)) { g_snprintf(buf, HEX_ENCODE_LENGTH + 1, "\\x%02x", *p); buf += HEX_ENCODE_LENGTH; *width += HEX_ENCODE_LENGTH; -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/bhyve/bhyve_parse_command.c | 3 +-- src/conf/nwfilter_conf.c | 3 +-- src/interface/interface_backend_udev.c | 3 +-- src/rpc/virnetsocket.c | 3 +-- src/util/virhostcpu.c | 7 +++---- src/util/virnetdevvportprofile.c | 3 +-- src/util/virpidfile.c | 3 +-- src/util/virstoragefile.c | 3 +-- src/util/virstring.c | 6 +++--- src/util/viruuid.c | 4 ++-- 10 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 050a558cee..5eec05c7d4 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -31,7 +31,6 @@ #include "virlog.h" #include "virstring.h" #include "virutil.h" -#include "c-ctype.h" #define VIR_FROM_THIS VIR_FROM_BHYVE @@ -212,7 +211,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, arglist[args_count++] = arg; arglist[args_count] = NULL; - while (next && c_isspace(*next)) + while (next && g_ascii_isspace(*next)) next++; curr = next; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 6c7b85d4c8..5bcf52a84c 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -42,7 +42,6 @@ #include "nwfilter_params.h" #include "nwfilter_conf.h" #include "domain_conf.h" -#include "c-ctype.h" #include "virfile.h" #include "virstring.h" @@ -775,7 +774,7 @@ parseStringItems(const struct int_map *int_map, i = 0; while (input[i]) { found = false; - while (c_isspace(input[i]) || input[i] == sep) + while (g_ascii_isspace(input[i]) || input[i] == sep) i++; if (!input[i]) break; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 29d91d3539..7df5cf2cc3 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -25,7 +25,6 @@ #include "virerror.h" #include "virfile.h" -#include "c-ctype.h" #include "datatypes.h" #include "domain_conf.h" #include "interface_driver.h" @@ -932,7 +931,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, vid_pos += strlen(vid_prefix); if ((vid_len = strspn(vid_pos, "0123456789")) == 0 || - !c_isspace(vid_pos[vid_len])) { + !g_ascii_isspace(vid_pos[vid_len])) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the VID for the VLAN device '%s'"), name); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 21ef7a8034..b98287e6d7 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -40,7 +40,6 @@ # include <sys/ucred.h> #endif -#include "c-ctype.h" #ifdef WITH_SELINUX # include <selinux/selinux.h> #endif @@ -1813,7 +1812,7 @@ static ssize_t virNetSocketReadWire(virNetSocketPtr sock, char *buf, size_t len) errout != NULL) { size_t elen = strlen(errout); /* remove trailing whitespace */ - while (elen && c_isspace(errout[elen - 1])) + while (elen && g_ascii_isspace(errout[elen - 1])) errout[--elen] = '\0'; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index a3ef067f41..22102f2c75 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -38,7 +38,6 @@ # include <sys/resource.h> #endif -#include "c-ctype.h" #include "viralloc.h" #define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW #include "virhostcpupriv.h" @@ -512,7 +511,7 @@ virHostCPUParseFrequencyString(const char *str, str += strlen(prefix); /* Skip all whitespace */ - while (c_isspace(*str)) + while (g_ascii_isspace(*str)) str++; if (*str == '\0') goto error; @@ -524,7 +523,7 @@ virHostCPUParseFrequencyString(const char *str, str++; /* Skip all whitespace */ - while (c_isspace(*str)) + while (g_ascii_isspace(*str)) str++; if (*str == '\0') goto error; @@ -533,7 +532,7 @@ virHostCPUParseFrequencyString(const char *str, * followed by a fractional part (which gets discarded) or some * leading whitespace */ if (virStrToLong_ui(str, &p, 10, &ui) < 0 || - (*p != '.' && *p != '\0' && !c_isspace(*p))) { + (*p != '.' && *p != '\0' && !g_ascii_isspace(*p))) { goto error; } diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 6442c2a2cf..a7e7361a4c 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -49,7 +49,6 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp, #if WITH_VIRTUALPORT # include <fcntl.h> -# include <c-ctype.h> # include <sys/socket.h> # include <sys/ioctl.h> @@ -482,7 +481,7 @@ virNetDevVPortProfileGetLldpadPid(void) char *endptr; if (virStrToLong_ui(buffer, &endptr, 10, &res) == 0 - && (*endptr == '\0' || c_isspace(*endptr)) + && (*endptr == '\0' || g_ascii_isspace(*endptr)) && res != 0) { pid = res; } else { diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index a825a23e49..249515aff2 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -34,7 +34,6 @@ #include "intprops.h" #include "virlog.h" #include "virerror.h" -#include "c-ctype.h" #include "virstring.h" #include "virprocess.h" @@ -130,7 +129,7 @@ int virPidFileReadPath(const char *path, pidstr[bytes] = '\0'; if (virStrToLong_ll(pidstr, &endptr, 10, &pid_value) < 0 || - !(*endptr == '\0' || c_isspace(*endptr)) || + !(*endptr == '\0' || g_ascii_isspace(*endptr)) || (pid_t) pid_value != pid_value) { rc = -1; goto cleanup; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 77f885ef1d..5e371694d1 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -30,7 +30,6 @@ #include "virerror.h" #include "virlog.h" #include "virfile.h" -#include "c-ctype.h" #include "vircommand.h" #include "virhash.h" #include "virendian.h" @@ -1376,7 +1375,7 @@ int virStorageFileGetLVMKey(const char *path, char *tmp = *key; /* Find first non-space character */ - while (*tmp && c_isspace(*tmp)) + while (*tmp && g_ascii_isspace(*tmp)) tmp++; /* Kill leading spaces */ if (tmp != *key) diff --git a/src/util/virstring.c b/src/util/virstring.c index a66b406298..311c9058db 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -794,7 +794,7 @@ virSkipSpaces(const char **str) { const char *cur = *str; - while (c_isspace(*cur)) + while (g_ascii_isspace(*cur)) cur++; *str = cur; } @@ -811,7 +811,7 @@ virSkipSpacesAndBackslash(const char **str) { const char *cur = *str; - while (c_isspace(*cur) || *cur == '\\') + while (g_ascii_isspace(*cur) || *cur == '\\') cur++; *str = cur; } @@ -840,7 +840,7 @@ virTrimSpaces(char *str, char **endp) end = str + strlen(str); else end = *endp; - while (end > str && c_isspace(end[-1])) + while (end > str && g_ascii_isspace(end[-1])) end--; if (endp) { if (!*endp) diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 7626d72c23..835c873300 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -102,7 +102,7 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) * 32 hexadecimal digits the end. */ cur = uuidstr; - while (c_isspace(*cur)) + while (g_ascii_isspace(*cur)) cur++; for (i = 0; i < VIR_UUID_BUFLEN;) { @@ -128,7 +128,7 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) } while (*cur) { - if (!c_isspace(*cur)) + if (!g_ascii_isspace(*cur)) goto error; cur++; } -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virmacaddr.c | 6 +++--- src/util/virutil.c | 2 +- src/util/viruuid.c | 5 ++--- src/vmx/vmx.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 3eb6407c45..a6893faf9a 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -38,9 +38,9 @@ virMacAddrCompare(const char *p, const char *q) { unsigned char c, d; do { - while (*p == '0' && c_isxdigit(p[1])) + while (*p == '0' && g_ascii_isxdigit(p[1])) ++p; - while (*q == '0' && c_isxdigit(q[1])) + while (*q == '0' && g_ascii_isxdigit(q[1])) ++q; c = c_tolower(*p); d = c_tolower(*q); @@ -153,7 +153,7 @@ virMacAddrParse(const char* str, virMacAddrPtr addr) /* This is solely to avoid accepting the leading * space or "+" that strtoul would otherwise accept. */ - if (!c_isxdigit(*str)) + if (!g_ascii_isxdigit(*str)) break; result = strtoul(str, &end_ptr, 16); /* exempt from syntax-check */ diff --git a/src/util/virutil.c b/src/util/virutil.c index f3cf494353..12f44796c8 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1525,7 +1525,7 @@ virValidateWWN(const char *wwn) p += 2; for (i = 0; p[i]; i++) { - if (!c_isxdigit(p[i])) + if (!g_ascii_isxdigit(p[i])) break; } diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 835c873300..0745189aa9 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -28,7 +28,6 @@ #include <time.h> #include <unistd.h> -#include "c-ctype.h" #include "internal.h" #include "virutil.h" #include "virerror.h" @@ -113,14 +112,14 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) cur++; continue; } - if (!c_isxdigit(*cur)) + if (!g_ascii_isxdigit(*cur)) goto error; uuid[i] = virHexToBin(*cur); uuid[i] *= 16; cur++; if (*cur == 0) goto error; - if (!c_isxdigit(*cur)) + if (!g_ascii_isxdigit(*cur)) goto error; uuid[i] += virHexToBin(*cur); i++; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 0ccc4eefe6..20dc974928 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -666,7 +666,7 @@ virVMXUnescapeHex(char *string, char escape) /* Unescape from 'cXX' where c is the escape char and X is a hex digit */ while (*tmp1 != '\0') { if (*tmp1 == escape) { - if (!c_isxdigit(tmp1[1]) || !c_isxdigit(tmp1[2])) + if (!g_ascii_isxdigit(tmp1[1]) || !g_ascii_isxdigit(tmp1[2])) return -1; *tmp2++ = virHexToBin(tmp1[1]) * 16 + virHexToBin(tmp1[2]); -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/remote/remote_driver.c | 3 +-- src/util/virmacaddr.c | 5 ++--- src/util/virutil.c | 5 ++--- src/vmx/vmx.c | 6 ++---- tools/virsh-domain.c | 3 +-- tools/vsh.c | 3 +-- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a1384fc655..176400a252 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -49,7 +49,6 @@ #include "virauth.h" #include "virauthconfig.h" #include "virstring.h" -#include "c-ctype.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -225,7 +224,7 @@ static int remoteSplitURIScheme(virURIPtr uri, p = *transport; while (*p) { - *p = c_tolower(*p); + *p = g_ascii_tolower(*p); p++; } } diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index a6893faf9a..182bd582fb 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -21,7 +21,6 @@ #include <config.h> -#include "c-ctype.h" #include "virmacaddr.h" #include "virrandom.h" #include "virutil.h" @@ -42,8 +41,8 @@ virMacAddrCompare(const char *p, const char *q) ++p; while (*q == '0' && g_ascii_isxdigit(q[1])) ++q; - c = c_tolower(*p); - d = c_tolower(*q); + c = g_ascii_tolower(*p); + d = g_ascii_tolower(*q); if (c == 0 || d == 0) break; diff --git a/src/util/virutil.c b/src/util/virutil.c index 12f44796c8..ed1f696e37 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -63,7 +63,6 @@ # include <sys/un.h> #endif -#include "c-ctype.h" #include "mgetgroups.h" #include "virerror.h" #include "virlog.h" @@ -201,7 +200,7 @@ virScaleInteger(unsigned long long *value, const char *suffix, if (!suffix[1] || STRCASEEQ(suffix + 1, "iB")) { base = 1024; - } else if (c_tolower(suffix[1]) == 'b' && !suffix[2]) { + } else if (g_ascii_tolower(suffix[1]) == 'b' && !suffix[2]) { base = 1000; } else { virReportError(VIR_ERR_INVALID_ARG, @@ -209,7 +208,7 @@ virScaleInteger(unsigned long long *value, const char *suffix, return -1; } scale = 1; - switch (c_tolower(*suffix)) { + switch (g_ascii_tolower(*suffix)) { case 'e': scale *= base; G_GNUC_FALLTHROUGH; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 20dc974928..fbf0dd7581 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -22,8 +22,6 @@ #include <config.h> -#include <c-ctype.h> - #include "internal.h" #include "virerror.h" #include "virfile.h" @@ -1089,7 +1087,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr def, tmp = copy; for (; *tmp != '\0'; ++tmp) - *tmp = c_tolower(*tmp); + *tmp = g_ascii_tolower(*tmp); model = virDomainControllerModelSCSITypeFromString(copy); VIR_FREE(copy); @@ -1972,7 +1970,7 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, tmp = virtualDev_string; for (; *tmp != '\0'; ++tmp) - *tmp = c_tolower(*tmp); + *tmp = g_ascii_tolower(*tmp); *virtualDev = virVMXControllerModelSCSITypeFromString(virtualDev_string); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b248a15c16..fb7c479f4d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -35,7 +35,6 @@ #include "internal.h" #include "virbitmap.h" #include "virbuffer.h" -#include "c-ctype.h" #include "conf/domain_conf.h" #include "viralloc.h" #include "vircommand.h" @@ -8780,7 +8779,7 @@ static int getSignalNumber(const char *signame) char *p = str; for (i = 0; signame[i]; i++) - p[i] = c_tolower(signame[i]); + p[i] = g_ascii_tolower(signame[i]); if (virStrToLong_i(p, NULL, 10, &signum) >= 0) return signum; diff --git a/tools/vsh.c b/tools/vsh.c index beee1c2986..6c78a7a373 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -25,7 +25,6 @@ #include <stdarg.h> #include <unistd.h> #include <sys/time.h> -#include "c-ctype.h" #include <fcntl.h> #include <time.h> #include <sys/stat.h> @@ -2343,7 +2342,7 @@ vshAskReedit(vshControl *ctl, const char *msg, bool relax_avail) while (true) { vshPrint(ctl, "\r%s %s %s: ", msg, _("Try again?"), relax_avail ? "[y,n,i,f,?]" : "[y,n,f,?]"); - c = c_tolower(getchar()); + c = g_ascii_tolower(getchar()); if (c == '?') { vshPrintRaw(ctl, -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virstring.c | 3 +-- tools/virsh-console.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 311c9058db..bd7c640042 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -21,7 +21,6 @@ #include <glib/gprintf.h> #include <locale.h> -#include "c-ctype.h" #include "virstring.h" #include "virthread.h" #include "viralloc.h" @@ -1329,7 +1328,7 @@ virStringToUpper(char **dst, const char *src) return -1; for (i = 0; src[i]; i++) { - cap[i] = c_toupper(src[i]); + cap[i] = g_ascii_toupper(src[i]); if (cap[i] == '-') cap[i] = '_'; } diff --git a/tools/virsh-console.c b/tools/virsh-console.c index a087d82776..2e498a6903 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -29,7 +29,6 @@ # include <poll.h> # include <unistd.h> # include <signal.h> -# include <c-ctype.h> # include "internal.h" # include "virsh.h" @@ -399,7 +398,7 @@ static char virshGetEscapeChar(const char *s) { if (*s == '^') - return CONTROL(c_toupper(s[1])); + return CONTROL(g_ascii_toupper(s[1])); return *s; } -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- build-aux/syntax-check.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index f1e976ec76..fd8c2c6be5 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -532,7 +532,7 @@ sc_prohibit_select: # Prohibit the inclusion of <ctype.h>. sc_prohibit_ctype_h: @prohibit='^# *include *<ctype\.h>' \ - halt='use c-ctype.h instead of ctype.h' \ + halt='use Glib g_ascii_* function instead of ctype.h' \ $(_sc_search_regexp) # We have our own wrapper for mocking purposes @@ -583,7 +583,7 @@ ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ sc_avoid_ctype_macros: @prohibit='\b($(ctype_re)) *\(' \ in_vc_files='\.[ch]$$' \ - halt='use c-ctype.h instead of ctype macros' \ + halt='use Glib g_ascii_ macros instead of ctype macros' \ $(_sc_search_regexp) sc_avoid_strcase: @@ -1552,13 +1552,6 @@ sc_prohibit_openat_without_use: re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat|(FCHMOD|FCHOWN|STAT)AT_INLINE)\>' \ $(_sc_header_without_use) -# Prohibit the inclusion of c-ctype.h without an actual use. -ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ -|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper -sc_prohibit_c_ctype_without_use: - @h='c-ctype.h' re='\<c_($(ctype_re)) *\(' \ - $(_sc_header_without_use) - # The following list was generated by running: # man signal.h|col -b|perl -ne '/bsd_signal.*;/.../sigwaitinfo.*;/ and print' \ # | perl -lne '/^\s+(?:int|void).*?(\w+).*/ and print $1' | fmt -- 2.23.0
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- bootstrap.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index abb03bf3a2..e1f715db37 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -20,7 +20,6 @@ gnulib_modules=' accept bind -c-ctype c-strcase canonicalize-lgpl chown -- 2.23.0
On Sun, Dec 08, 2019 at 06:36:22PM -0500, Cole Robinson wrote:
On 11/20/19 9:48 AM, Pavel Hrdina wrote:
Changes in v2: - fixed missing parentheses in patch 01 - added patch 02 to cover c_isascii
With the two issues I pointed out fixed:
Reviewed-by: Cole Robinson <crobinso@redhat.com>
Thanks, fixed and pushed. Pavel
participants (2)
-
Cole Robinson -
Pavel Hrdina