Changeset 3c99e2c9568a84f9e8bb60549c145d3f03d73716

Timestamp:

08/15/07 04:06:03 (5 years ago)

Author:

dsmith <dsmith@…>

git-author:

L. Donnie Smith <donnie.smith@gatech.edu> / 2007-08-15T04:06:03Z+0000

Parents:

7e5f213decff36c62421b1b3d02d02b3037c79a2

Children:

1f9dd8c8de2bc38d5c4869baf313a732feb248ad

git-committer:

dsmith <dsmith@918edb2d-ff29-0410-9de2-eb38e7f22bc7> / 2007-08-15T04:06:03Z+0000

Message:

stifled cwiid_connect errors on wminput reconnect

git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@143 918edb2d-ff29-0410-9de2-eb38e7f22bc7

Files:

• ChangeLog (modified) (1 diff)
• libcwiid/cwiid.h (modified) (2 diffs)
• libcwiid/util.c (modified) (4 diffs)
• wminput/main.c (modified) (3 diffs)

ChangeLog

@@ -1 +1 @@
 2007-08-14 L. Donnie Smith <cwiid@abstrakraft.org>
+        libcwiid
+        * make cwiid_err_default public
+
         wminput
         * added {c,py}_wiimote_deinit functions

libcwiid/cwiid.h

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2008-08-14 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * make cwiid_err_default public
+ *
  *  2007-05-16 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * changed cwiid_connect, cwiid_disconnect to cwiid_open, cwiid_close
@@ -301 +304 @@
 /* Error reporting (library wide) */
 int cwiid_set_err(cwiid_err_t *err);
+void cwiid_err_default(struct wiimote *wiimote, const char *str, va_list ap);
 
 /* Connection */

libcwiid/util.c

@@ -16 +16 @@
  *
  *  ChangeLog:
+ *  2008-08-14 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * make cwiid_err_default public
+ *  * clean up cwiid_err
+ *
  *  2007-04-24 L. Donnie Smith <cwiid@abstrakraft.org>
  *  * rewrite for API overhaul
@@ -55 +59 @@
 #include "cwiid_internal.h"
 
-static cwiid_err_t cwiid_err_default;
+cwiid_err_t cwiid_err_default;
 
 static cwiid_err_t *cwiid_err_func = &cwiid_err_default;
@@ -68 +72 @@
 }
 
-static void cwiid_err_default(struct wiimote *wiimote, const char *str,
-                              va_list ap)
+void cwiid_err_default(struct wiimote *wiimote, const char *str, va_list ap)
 {
         vfprintf(stderr, str, ap);
@@ -81 +84 @@
         if (cwiid_err_func) {
                 va_start(ap, str);
-                if (wiimote) {
-                        (*cwiid_err_func)(wiimote, str, ap);
-                }
-                else {
-                        (*cwiid_err_func)(NULL, str, ap);
-                }
+                (*cwiid_err_func)(wiimote, str, ap);
                 va_end(ap);
         }

wminput/main.c

@@ -65 +65 @@
 #endif
 
+#include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -114 +115 @@
         printf("\t-d, --daemon\t\tImplies -q, -r, and -w.\n");
         printf("\t-q, --quiet\t\tReduce output to errors\n");
-        printf("\t-r, --reconnect [wait]\t\tAutomatically try reconnect after wiimote disconnect.\n");
+        printf("\t-r, --reconnect [wait]\tAutomatically try reconnect after wiimote disconnect.\n");
         printf("\t-w, --wait\t\tWait indefinitely for wiimote to connect.\n");
+}
+
+void cwiid_err_connect(struct wiimote *wiimote, const char *str, va_list ap)
+{
+        /* TODO: temporary kludge to stifle error messages from cwiid_open */
+        if (errno != EHOSTDOWN) {
+                vfprintf(stderr, str, ap);
+                fprintf(stderr, "\n");
+        }
 }
 
@@ -279 +289 @@
                         }
                         /* TODO: avoid continuously calling cwiid_open */
-                        /* TODO: kill error messages on failed cwiid_open calls */
+                        cwiid_set_err(cwiid_err_connect);
                         while (!(wiimote = cwiid_open(&current_bdaddr, CWIID_FLAG_MESG_IFC)));
+                        cwiid_set_err(cwiid_err_default);
                 }
                 else {