# Convert uses of isspace to c_isspace, isdigit to c_isdigit, etc.
re=$(man isspace|grep is.....,.is|sed 's/ -.*//' \
|tr -s ', \n' \||sed 's/^|//;s/|$//')
git grep -l -E "$re"|grep -Ev 'Chan|gnulib' \
|xargs perl -pi -e 's/\b('"$re"')\b/c_$1/g'
# Remove all uses of to_uchar
git grep -l to_uchar|xargs perl -pi -e 's/to_uchar\((.*?)\)/$1/g'
* src/util.h (to_uchar): Remove definition.
(TOLOWER): Remove definition.
(__virMacAddrCompare): Use c_tolower, not TOLOWER.
Globally:
Where needed, change <ctype.h> to <c-ctype.h>.
Remove unnecessary inclusion of <ctype.h>.
Ensure the global changes are never needed again:
* Makefile.maint (sc_avoid_ctype_macros): Prohibit use of ctype
macros. Recommend c-ctype.h instead.
(sc_prohibit_c_ctype_without_use): New rule.
(sc_prohibit_ctype_h): New rule. Disallow use of <ctype.h>.
Fri May 9 15:45:39 CEST 2008 Jim Meyering <meyering@redhat.com>
+ Use gnulib's c-ctype.h, not <ctype.h>.
+ # Convert uses of isspace to c_isspace, isdigit to c_isdigit, etc.
+ re=$(man isspace|grep is.....,.is|sed 's/ -.*//' \
+ |tr -s ', \n' \||sed 's/^|//;s/|$//')
+ git grep -l -E "$re"|grep -Ev 'Chan|gnulib' \
+ |xargs perl -pi -e 's/\b('"$re"')\b/c_$1/g'
+ # Remove all uses of to_uchar
+ git grep -l to_uchar|xargs perl -pi -e 's/to_uchar\((.*?)\)/$1/g'
+ * src/util.h (to_uchar): Remove definition.
+ (TOLOWER): Remove definition.
+ (__virMacAddrCompare): Use c_tolower, not TOLOWER.
+ Globally:
+ Where needed, change <ctype.h> to <c-ctype.h>.
+ Remove unnecessary inclusion of <ctype.h>.
+ Ensure the global changes are never needed again:
+ * Makefile.maint (sc_avoid_ctype_macros): Prohibit use of ctype
+ macros. Recommend c-ctype.h instead.
+ (sc_prohibit_c_ctype_without_use): New rule.
+ (sc_prohibit_ctype_h): New rule. Disallow use of <ctype.h>.
+
Prepare to use gnulib's c-type module.
* bootstrap: Move module list into separate variable w/less syntax.
(modules): Add c-ctype.
sc_prohibit_quote_without_use:
@h='"quote.h"' re='\<quote(_n)? *\(' $(_header_without_use)
+# Prohibit the inclusion of c-ctype.h without an actual use.
+sc_prohibit_c_ctype_without_use:
+ @h='[<"]c-ctype.h[">]' re='\<c_($(ctype_re)) *\(' $(_header_without_use)
+
+# Prohibit the inclusion of <ctype.h>.
+sc_prohibit_ctype_h:
+ @grep -E '^# *include *<ctype\.h>' $$($(VC_LIST_EXCEPT)) && \
+ { echo "$(ME): don't use ctype.h; instead, use c-ctype.h" \
+ 1>&2; exit 1; } || :
+
sc_obsolete_symbols:
@grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \
$$($(VC_LIST_EXCEPT)) && \
ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
-sc_risky_ctype_macros:
+sc_avoid_ctype_macros:
@grep -E '\b($(ctype_re)) *\(' /dev/null \
- $$($(VC_LIST_EXCEPT)) | grep -v to_uchar && \
- { echo '$(ME): found ctype macro use without to_uchar' \
+ $$($(VC_LIST_EXCEPT)) && \
+ { echo "$(ME): don't use ctype macros (use c-ctype.h)" \
1>&2; exit 1; } || :
# Match lines like the following, but where there is only one space
#include <syslog.h>
#include <string.h>
#include <errno.h>
-#include <ctype.h>
#include <fnmatch.h>
#ifdef HAVE_POLKIT
/*
* buf.c: buffers for libvirt
*
- * Copyright (C) 2005-2007 Red Hat, Inc.
+ * Copyright (C) 2005-2008 Red Hat, Inc.
*
* See COPYING.LIB for the License of this software
*
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#include <ctype.h>
#define __VIR_BUFFER_C__
#include <string.h>
#include <stdlib.h>
#include <errno.h>
-#include <ctype.h>
+#include <c-ctype.h>
#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
char *buf = line;
if (STREQLEN(buf, "processor", 9)) { /* aka a single logical CPU */
buf += 9;
- while (*buf && isspace(to_uchar(*buf)))
+ while (*buf && c_isspace(*buf))
buf++;
if (*buf != ':') {
__virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR,
char *p;
unsigned int ui;
buf += 9;
- while (*buf && isspace(to_uchar(*buf)))
+ while (*buf && c_isspace(*buf))
buf++;
if (*buf != ':' || !buf[1]) {
__virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR,
}
if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0
/* Accept trailing fractional part. */
- && (*p == '\0' || *p == '.' || isspace(to_uchar(*p))))
+ && (*p == '\0' || *p == '.' || c_isspace(*p)))
nodeinfo->mhz = ui;
} else if (STREQLEN(buf, "cpu cores", 9)) { /* aka cores */
char *p;
unsigned int id;
buf += 9;
- while (*buf && isspace(to_uchar(*buf)))
+ while (*buf && c_isspace(*buf))
buf++;
if (*buf != ':' || !buf[1]) {
__virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR,
return -1;
}
if (virStrToLong_ui(buf+1, &p, 10, &id) == 0
- && (*p == '\0' || isspace(to_uchar(*p)))
+ && (*p == '\0' || c_isspace(*p))
&& id > nodeinfo->cores)
nodeinfo->cores = id;
}
#include <fcntl.h>
#include <signal.h>
#include <paths.h>
-#include <ctype.h>
#include <pwd.h>
#include <stdio.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <signal.h>
#include <paths.h>
-#include <ctype.h>
+#include <c-ctype.h>
#include <pwd.h>
#include <stdio.h>
#include <sys/wait.h>
*/
tmp = path;
while (*tmp) {
- if (isspace(to_uchar(*tmp))) {
+ if (c_isspace(*tmp)) {
*tmp = '\0';
*offset += (sizeof(needle)-1) + strlen(path);
return 0;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
+#include <c-ctype.h>
#include <errno.h>
#include "internal.h"
} else {
start = ptr;
- while (*ptr && !isspace(to_uchar(*ptr))
+ while (*ptr && !c_isspace(*ptr)
&& *ptr != ')' && *ptr != '(') {
ptr++;
}
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
-#include <ctype.h>
+#include <c-ctype.h>
#ifdef WITH_XEN
#include <xs.h>
}
if (path[4] != '\0') {
- if (!isdigit(to_uchar(path[4])) || path[4] == '0' ||
+ if (!c_isdigit(path[4]) || path[4] == '0' ||
virStrToLong_i(path+4, NULL, 10, &part) < 0 ||
part < 1 || part > 15) {
statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__,
} else {
p = path + 3;
}
- if (p && (!isdigit(to_uchar(*p)) || *p == '0' ||
+ if (p && (!c_isdigit(*p) || *p == '0' ||
virStrToLong_i(p, NULL, 10, &part) < 0 ||
part < 1 || part > 15)) {
statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__,
}
if (path[3] != '\0') {
- if (!isdigit(to_uchar(path[3])) || path[3] == '0' ||
+ if (!c_isdigit(path[3]) || path[3] == '0' ||
virStrToLong_i(path+3, NULL, 10, &part) < 0 ||
part < 1 || part > 63) {
statsErrorFunc (conn, VIR_ERR_INVALID_ARG, __FUNCTION__,
#include <sys/wait.h>
#endif
#include <string.h>
-#include <ctype.h>
+#include <c-ctype.h>
#ifdef HAVE_PATHS_H
#include <paths.h>
#define MAX_ERROR_LEN 1024
-#define TOLOWER(Ch) (isupper (to_uchar(Ch)) \
- ? tolower (to_uchar (Ch)) : (to_uchar (Ch)))
-
#define virLog(msg...) fprintf(stderr, msg)
#ifndef PROXY
{
unsigned char c, d;
do {
- while (*p == '0' && isxdigit (to_uchar(p[1])))
+ while (*p == '0' && c_isxdigit (p[1]))
++p;
- while (*q == '0' && isxdigit (to_uchar(q[1])))
+ while (*q == '0' && c_isxdigit (q[1]))
++q;
- c = TOLOWER (*p);
- d = TOLOWER (*q);
+ c = c_tolower (*p);
+ d = c_tolower (*q);
if (c == 0 || d == 0)
break;
/* This is solely to avoid accepting the leading
* space or "+" that strtoul would otherwise accept.
*/
- if (!isxdigit(to_uchar(*str)))
+ if (!c_isxdigit(*str))
break;
result = strtoul(str, &end_ptr, 16);
#include "internal.h"
#include "util-lib.h"
-/* Convert a possibly-signed character to an unsigned character. This is
- a bit safer than casting to unsigned char, since it catches some type
- errors that the cast doesn't. */
-static inline unsigned char to_uchar (char ch) { return ch; }
-
int virExec(virConnectPtr conn, char **argv, int *retpid,
int infd, int *outfd, int *errfd);
int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid,
#include <getopt.h>
#include <sys/types.h>
#include <sys/time.h>
-#include <ctype.h>
+#include <c-ctype.h>
#include <fcntl.h>
#include <locale.h>
#include <time.h>
for (i = 0; cpulist[i]; i++) {
switch (state) {
case expect_num:
- if (!isdigit (to_uchar(cpulist[i]))) {
+ if (!c_isdigit (cpulist[i])) {
vshError( ctl, FALSE, _("cpulist: %s: Invalid format. Expecting digit at position %d (near '%c')."), cpulist, i, cpulist[i]);
virDomainFree (dom);
return FALSE;
case expect_num_or_comma:
if (cpulist[i] == ',')
state = expect_num;
- else if (!isdigit (to_uchar(cpulist[i]))) {
+ else if (!c_isdigit (cpulist[i])) {
vshError(ctl, FALSE, _("cpulist: %s: Invalid format. Expecting digit or comma at position %d (near '%c')."), cpulist, i, cpulist[i]);
virDomainFree (dom);
return FALSE;
if (tk == VSH_TK_NONE) {
if (*p == '-' && *(p + 1) == '-' && *(p + 2)
- && isalnum(to_uchar(*(p + 2)))) {
+ && c_isalnum(*(p + 2))) {
tk = VSH_TK_OPTION;
p += 2;
} else {
#include <arpa/inet.h>
#include <netdb.h>
#include <libxml/uri.h>
-#include <ctype.h>
#include <errno.h>
#include "libvirt/libvirt.h"
projects / libvirt.git / commitdiff