lib/keyword.c, src/method-impl.lisp: Use `kw.valist' consistently.

Argh.  I had `kw.va_list' intermixed.  Settle on the version without the
underscore (because it matches `K_VALIST' better).

diff --git a/lib/keyword.c b/lib/keyword.c
index 8ebf655..024b52a 100644 (file)
--- a/lib/keyword.c
+++ b/lib/keyword.c
@@ -82,7 +82,7 @@ void kw_parseempty(const char *set, const char *kwfirst, va_list *ap,
   size_t nn;
 
   for (k = kwfirst; k; k = va_arg(*ap, const char *)) {
-    if (!strcmp(k, "kw.va_list")) {
+    if (!strcmp(k, "kw.valist")) {
       aap = va_arg(*ap, va_list *);
       kk = va_arg(*aap, const char *);
       kw_parseempty(set, kk, aap, 0, 0);
@@ -94,7 +94,7 @@ void kw_parseempty(const char *set, const char *kwfirst, va_list *ap,
       kw_unknown(set, k);
   }
   while (n) {
-    if (!strcmp(v->kw, "kw.va_list")) {
+    if (!strcmp(v->kw, "kw.valist")) {
       aap = *(va_list *const *)v->val;
       kk = va_arg(*aap, const char *);
       kw_parseempty(set, kk, aap, 0, 0);

diff --git a/src/method-impl.lisp b/src/method-impl.lisp
index 6c751a4..d0c7a54 100644 (file)
--- a/src/method-impl.lisp
+++ b/src/method-impl.lisp
@@ -555,7 +555,7 @@
       (codegen-push codegen)
       (call "aap" "va_arg" "*ap" (c-type (* va-list)))
       (call :void name "kw" "aap" *null-pointer* 0)
-      (setf va-act (namecheck "k" "kw.va_list"
+      (setf va-act (namecheck "k" "kw.valist"
                              (codegen-pop-block codegen) va-act))
 
       ;; Finish up the varargs loop.
@@ -581,7 +581,7 @@
       (codegen-push codegen)
       (convert "aap" (c-type (* va-list)))
       (call :void name "kw" "aap" *null-pointer* 0)
-      (setf tab-act (namecheck "v->kw" "kw.va_list"
+      (setf tab-act (namecheck "v->kw" "kw.valist"
                               (codegen-pop-block codegen) tab-act))
 
       ;; Finish off the table loop.