浏览代码

no need to avoid calling ctype functions as now they are implemented
by us (no inefficiencies due to accessing locale information)

Roberto Ierusalimschy 15 年之前
父节点
当前提交
cf22133b69
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      lobject.c

+ 2 - 4
lobject.c

@@ -1,5 +1,5 @@
 /*
 /*
-** $Id: lobject.c,v 2.37 2010/04/05 16:26:37 roberto Exp roberto $
+** $Id: lobject.c,v 2.38 2010/04/13 20:48:12 roberto Exp roberto $
 ** Some generic functions over Lua objects
 ** Some generic functions over Lua objects
 ** See Copyright Notice in lua.h
 ** See Copyright Notice in lua.h
 */
 */
@@ -112,10 +112,8 @@ int luaO_str2d (const char *s, lua_Number *result) {
   if (endptr == s) return 0;  /* conversion failed */
   if (endptr == s) return 0;  /* conversion failed */
   if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
   if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
     *result = cast_num(strtoul(s, &endptr, 16));
     *result = cast_num(strtoul(s, &endptr, 16));
-  if (*endptr == '\0') return 1;  /* most common case */
   while (lisspace(cast(unsigned char, *endptr))) endptr++;
   while (lisspace(cast(unsigned char, *endptr))) endptr++;
-  if (*endptr != '\0') return 0;  /* invalid trailing characters? */
-  return 1;
+  return (*endptr == '\0');  /* OK if no trailing characters */
 }
 }