Changeset 874

Timestamp:

05/23/07 19:40:20 (1 year ago)

Author:

shawnw

Message:

Some linting. New BOOL type for boolean values attempts to use the C99 _Bool type if supported by the compiler.

Files:

• 1.8.3/branches/devel/config.h.in (modified) (2 diffs)
• 1.8.3/branches/devel/configure (modified) (3 diffs)
• 1.8.3/branches/devel/configure.in (modified) (2 diffs)
• 1.8.3/branches/devel/hdrs/atr_tab.h (modified) (1 diff)
• 1.8.3/branches/devel/hdrs/attrib.h (modified) (2 diffs)
• 1.8.3/branches/devel/hdrs/externs.h (modified) (2 diffs)
• 1.8.3/branches/devel/hdrs/lock.h (modified) (4 diffs)
• 1.8.3/branches/devel/hdrs/mushtype.h (modified) (2 diffs)
• 1.8.3/branches/devel/hdrs/privtab.h (modified) (3 diffs)
• 1.8.3/branches/devel/hdrs/ptab.h (modified) (1 diff)
• 1.8.3/branches/devel/src/access.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/atr_tab.c (modified) (1 diff)
• 1.8.3/branches/devel/src/attrib.c (modified) (12 diffs)
• 1.8.3/branches/devel/src/boolexp.c (modified) (14 diffs)
• 1.8.3/branches/devel/src/cque.c (modified) (6 diffs)
• 1.8.3/branches/devel/src/db.c (modified) (3 diffs)
• 1.8.3/branches/devel/src/fundb.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/lock.c (modified) (12 diffs)
• 1.8.3/branches/devel/src/pcre.c (modified) (1 diff)
• 1.8.3/branches/devel/src/player.c (modified) (1 diff)
• 1.8.3/branches/devel/src/privtab.c (modified) (7 diffs)
• 1.8.3/branches/devel/src/ptab.c (modified) (16 diffs)
• 1.8.3/branches/devel/src/set.c (modified) (1 diff)
• 1.8.3/branches/devel/src/strutil.c (modified) (4 diffs)
• 1.8.3/branches/devel/src/warnings.c (modified) (2 diffs)
• 1.8.3/branches/devel/utils/splint.sh (added)

1.8.3/branches/devel/config.h.in

@@ -62 +62 @@
-#undef HAVE_SYS_RESOURCE_H
-
+#undef HAVE_STDBOOL_H
+
-/* Libraries */
-
@@ -89 +91 @@
-
-#undef pid_t
+
+#ifdef HAVE__BOOL
+typedef _Bool BOOL;
+#else
+typedef int BOOL;
+#endif
-
-typedef void* Malloc_t;

1.8.3/branches/devel/configure

@@ -2765 +2765 @@
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+   { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict(ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy work.
+static void
+test_varargs(const char *format, ...)
+{
+  va_list args;
+  va_start(args, format);
+  va_list args_copy;
+  va_copy(args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+    {
+    case 's': // string
+      str = va_arg(args_copy, const char *);
+      break;
+    case 'd': // int
+      number = va_arg(args_copy, int);
+      break;
+    case 'f': // float
+      fnumber = (float) va_arg(args_copy, double);
+      break;
+    default:
+      break;
+    }
+    }
+  va_end(args_copy);
+  va_end(args);
+}
+
+int
+main ()
+{
+
+  // Check bool and long long datatypes.
+  _Bool success = false;
+  long long int bignum = -1234567890LL;
+  unsigned long long int ubignum = 1234567890uLL;
+
+  // Check restrict.
+  if (test_restrict("String literal") != 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs("s, d' f .", "string", 65, 34.234);
+
+  // Check incomplete arrays work.
+  struct incomplete_array *ia =
+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = (double) i * 1.234;
+
+  // Check named initialisers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[43] = 543;
+
+  // work around unused variable warnings
+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+
+
+
-# Extract the first word of "chmod", so it can be a program name with args.
-set dummy chmod; ac_word=$2
@@ -4098 +4287 @@
-fi
-
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+          inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+           { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }
+if test "${ac_cv_header_stdbool_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdbool.h>
+#ifndef bool
+ "error: bool is not defined"
+#endif
+#ifndef false
+ "error: false is not defined"
+#endif
+#if false
+ "error: false is not 0"
+#endif
+#ifndef true
+ "error: true is not defined"
+#endif
+#if true != 1
+ "error: true is not 1"
+#endif
+#ifndef __bool_true_false_are_defined
+ "error: __bool_true_false_are_defined is not defined"
+#endif
+
+    struct s { _Bool s: 1; _Bool t; } s;
+
+    char a[true == 1 ? 1 : -1];
+    char b[false == 0 ? 1 : -1];
+    char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+    char d[(bool) 0.5 == true ? 1 : -1];
+    bool e = &s;
+    char f[(_Bool) 0.0 == false ? 1 : -1];
+    char g[true];
+    char h[sizeof (_Bool)];
+    char i[sizeof s.t];
+    enum { j = false, k = true, l = false * true, m = true * 256 };
+    _Bool n[m];
+    char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+    char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+#   if defined __xlc__ || defined __GNUC__
+     /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+        reported by James Lemley on 2005-10-05; see
+        http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+        This test is not quite right, since xlc is allowed to
+        reject this program, as the initializer for xlcbug is
+        not one of the forms that C requires support for.
+        However, doing the test right would require a runtime
+        test, and that would make cross-compilation harder.
+        Let us hope that IBM fixes the xlc bug, and also adds
+        support for this kind of constant expression.  In the
+        meantime, this test will reject xlc, which is OK, since
+        our stdbool.h substitute should suffice.  We also test
+        this with GCC, where it should work, to detect more
+        quickly whether someone messes up the test in the
+        future.  */
+     char digs[] = "0123456789";
+     int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+#   endif
+    /* Catch a bug in an HP-UX C compiler.  See
+       http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+       http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+     */
+    _Bool q = true;
+    _Bool *pq = &q;
+
+int
+main ()
+{
+
+    *pq |= q;
+    *pq |= ! q;
+    /* Refer to every declared value, to avoid compiler optimizations.  */
+    return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+        + !m + !n + !o + !p + !q + !pq);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdbool_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_cv_header_stdbool_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
+{ echo "$as_me:$LINENO: checking for _Bool" >&5
+echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
+if test "${ac_cv_type__Bool+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef _Bool ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type__Bool=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_cv_type__Bool=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
+if test $ac_cv_type__Bool = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
+_ACEOF
+
+
+fi
+
+if test $ac_cv_header_stdbool_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STDBOOL_H 1
+_ACEOF
+
+fi
+
-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
@@ -4259 +4754 @@
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-          inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-     { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-           { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-if test "${ac_cv_header_sys_time_h+set}" = set; then

1.8.3/branches/devel/configure.in

@@ -14 +14 @@
-AC_PATH_PROG(CAT, cat)
-AC_PROG_CC
+AC_PROG_CC_C99
-AC_PATH_PROG(CHMOD, chmod)
-AC_PATH_PROG(CP, cp)
@@ -57 +58 @@
-# <stdint.h> is checked by this.
-AC_HEADER_STDC
+AC_HEADER_STDBOOL
-AC_HEADER_SYS_WAIT
-AC_HEADER_TIME

1.8.3/branches/devel/hdrs/atr_tab.h

@@ -68 +68 @@
-  {"FOLLOW", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-
-
- | AF_PREFIXMATCH
-
- | AF_PREFIXMATCH
+ | AF_PREFIXMATCH
+
+ | AF_PREFIXMATCH
+
-  {"FORWARDLIST", AF_NOPROG | AF_PRIVATE | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE,
-   0, NULL},

1.8.3/branches/devel/hdrs/attrib.h

@@ -81 +81 @@
-extern void do_atrlock(dbref player, char const *arg1, char const *arg2);
-extern void do_atrchown(dbref player, char const *arg1, char const *arg2);
-extern int string_to_atrflag(dbref player, const char *p
-extern int string_to_atrflagsets(dbref player, const char *p, int
-int
-int
+int string_to_atrflag(dbref player, const char *p, privbits *bits
+int string_to_atrflagsets(dbref player, const char *p, privbits
+privbits
+privbits
-extern void init_atr_name_tree(void);
-
@@ -97 +97 @@
-
-/* possible attribute flags */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
-                       exist in the database */
-
-
-
-
-
+U
+U
+U
+U
+U
-
-
+U
-
-    extern ATTR attr[];

1.8.3/branches/devel/hdrs/externs.h

@@ -402 +402 @@
-extern char *split_token(char **sp, char sep);
-extern char *chopstr(const char *str, size_t lim);
-RESTRICT
-RESTRICT
+ restrict
+ restrict 
-extern const char *string_match(const char *src, const char *sub);
-extern char *strupper(const char *s);
@@ -562 +562 @@
-/* From wild.c */
-    extern int local_wild_match_case(const char *RESTRICT s,
-int
+BOOL
-    extern int wildcard(const char *s);
-    extern int quick_wild_new(const char *RESTRICT tstr,
-int
+BOOL
-    extern int regexp_match_case(const char *RESTRICT s, const char *RESTRICT d,
-int
+BOOL
-    extern int quick_regexp_match(const char *RESTRICT s,
-int
+BOOL
-    extern int wild_match_case(const char *RESTRICT s, const char *RESTRICT d,
-int
+BOOL
-    extern int wild_match_case_r(const char *RESTRICT s,
-int
+BOOL
-                 char **ary, int max);
-    extern int quick_wild(const char *RESTRICT tsr, const char *RESTRICT dstr);

1.8.3/branches/devel/hdrs/lock.h

@@ -26 +26 @@
-  boolexp key;      /**< Lock value ("key") */
-  dbref creator;        /**< Dbref of lock creator */
-int
+privbits
-  struct lock_list *next;   /**< Pointer to next lock in object's list */
-};
@@ -41 +41 @@
-};
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-/* lock.c */
@@ -56 +57 @@
-lock_type match_lock(lock_type type);
-const lock_list *get_lockproto(lock_type type);
-
+
+
-int add_lock_raw(dbref player, dbref thing, lock_type type,
-int
+privbits
-void free_locks(lock_list *ll);
-int eval_lock(dbref player, dbref thing, lock_type ltype);
@@ -85 +87 @@
-#define L_NEXT(lock) ((lock)->next)
-/* can p read/evaluate lock l on object x? */
-int
+BOOL
-#define Can_Read_Lock(p,x,l)   \
-    (See_All(p) || controls(p,x) || ((Visual(x) || lock_visual(x, l)) && \

1.8.3/branches/devel/hdrs/mushtype.h

@@ -4 +4 @@
-#ifdef HAS_OPENSSL
-#include <openssl/ssl.h>
+#endif
+#ifdef HAVE_STDINT_IN
+#include <stdint.h>
-#endif
-
@@ -13 +16 @@
-
-/** The type that stores the warning bitmask */
-
+
+
+
+
-
-/* special dbref's */

1.8.3/branches/devel/hdrs/privtab.h

@@ -9 +9 @@
-#include "confmagic.h"
-
+typedef struct priv_info PRIV;
-
-typedef struct priv_info PRIV;
-/** Privileges.
- * This structure represents a privilege and its associated data.
@@ -19 +19 @@
-  const char *name; /**< Name of the privilege */
-  char letter;      /**< One-letter abbreviation */
-long int
-long int
+privbits
+privbits
-};
-
@@ -28 +28 @@
-#define PrivShowBits(x) ((x)->bits_to_show)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-#endif              /* __PRIVTAB_H */

1.8.3/branches/devel/hdrs/ptab.h

@@ -10 +10 @@
- */
-typedef struct ptab {
-int
-in
-int maxlen;  
-in
+BOOL
+size_
+size_t maxlen;
+size_
-  struct ptab_entry **tab;  /**< Pointer to array of entries */
-} PTAB;

1.8.3/branches/devel/src/access.c

@@ -238 +238 @@
-  acsflag *c;
-
-printf(tmpf
+nprintf(tmpf, BUFFER_LEN
-  /* Be sure we have a file descriptor */
-  release_fd();
@@ -510 +510 @@
-  tmp->cant = cant;
-  strcpy(tmp->host, host);
-printf(tmp->comment, "By %s(#%d) on %s", Name(player), player,
-
+nprintf(tmp->comment, sizeof tmp->comment, 
+ "By %s(#%d) on %s", Name(player), player, 
-  tmp->next = NULL;
-

1.8.3/branches/devel/src/atr_tab.c

@@ -177 +177 @@
-{
-  ATTR *ap, *ap2;
-int
+privbits
-  int i;
-  int insert = 0;

1.8.3/branches/devel/src/attrib.c

@@ -198 +198 @@
- * \param player the dbref to use for privilege checks.
- * \param p a space-separated string of attribute flags.
-
+
+
- */
-int
-
-
-int
+, privbits *bits
+
+privbits
-  f = string_to_privs(attr_privs_set, p, 0);
-  if (!f)
@@ -212 +213 @@
-    return -1;
-  f &= ~AF_INTERNAL;
-
+
+
-}
-
@@ -223 +225 @@
- * \param setbits pointer to address of bitmask to set.
- * \param clrbits pointer to address of bitmask to clear.
-setbit
+0 on succes
- */
-int
-
+
+
-{
-  int f;
@@ -237 +240 @@
-  if (!See_All(player) && ((*setbits & AF_WIZARD) || (*clrbits & AF_WIZARD)))
-    return -1;
-
-
+
-}
-
@@ -247 +249 @@
- */
-const char *
-int
+privbits
-{
-  return privs_to_string(attr_privs_view, mask);
@@ -528 +530 @@
-void
-atr_new_add(dbref thing, const char *RESTRICT atr, const char *RESTRICT s,
-nsigned int flags, unsigned char
+