Changeset 128

Timestamp:

06/18/07 19:28:49 (2 years ago)

Author:

dsmith

Message:

revised error messages and doc strings

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/python/Wiimote.c (modified) (19 diffs)
• trunk/wminput/conf.c (modified) (7 diffs)
• trunk/wminput/main.c (modified) (6 diffs)
• trunk/wminput/py_plugin.c (modified) (13 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
+        wminput
+        * revised error messages
+
+        python
+        * revised error messages and doc strings
+
-2007-06-14 L. Donnie Smith <cwiid@abstrakraft.org>
-        libcwiid

trunk/python/Wiimote.c

@@ -20 +20 @@
- *
- * ChangeLog:
+ * 2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
+ * * revised error messages and doc strings
+ *
- * 2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
- * * removed Wiimote_FromC function
@@ -97 +100 @@
-{
-        {"close", (PyCFunction)Wiimote_close, METH_NOARGS,
- w
+()\n\nClose the W
-        {"enable", (PyCFunction)Wiimote_enable, METH_VARARGS | METH_KEYWORDS,
- flags on wiimote
+(flags)\n\nenable Wiimote connection flags
-        {"disable", (PyCFunction)Wiimote_disable, METH_VARARGS | METH_KEYWORDS,
- flags on wiimote
+(flags)\n\ndisable Wiimote connection flags
-        {"get_mesg", (PyCFunction)Wiimote_get_mesg, METH_NOARGS,
-blocking call to get messages
+get_mesg() -> message list\n\nretrieve message list from queue
-        {"get_acc_cal", (PyCFunction)Wiimote_get_acc_cal,
-
+
+
+
-        {"request_status", (PyCFunction)Wiimote_request_status, METH_NOARGS,
-
+_status()\n\nrequest
-        {"read", (PyCFunction)Wiimote_read, METH_VARARGS | METH_KEYWORDS,
- from w
+(flags,offset,len) -> buffer\n\nread data from W
-        {"write", (PyCFunction)Wiimote_write, METH_VARARGS | METH_KEYWORDS,
- to w
+(flags,offset,buffer)\n\nwrite data to W
-        {NULL, NULL, 0, NULL}
-};
@@ -148 +153 @@
-        0,                                              /* tp_as_buffer */
-        Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,       /* tp_flags */
-cwiid c-python interface
+CWiid Wiimote connection object
-        0,                                              /* tp_traverse */
-        0,                                              /* tp_clear */
@@ -194 +199 @@
-}
-
-static int cwiid_start(Wiimote *self, int flags)
-{
-        cwiid_wiimote_t *wiimote;
-
-        /* Set up wiimote */
-
-        /* keep pyobject with wiimote */
-        cwiid_set_data(wiimote,self);
-        /* keep wiimote with pyobject */
-        self->wiimote = wiimote;
-        return 0;
-}
-
-static int Wiimote_init(Wiimote* self, PyObject* args, PyObject *kwds)
-{
@@ -234 +226 @@
-                if (str_bdaddr) {
-                        if (str2ba(str_bdaddr, &bdaddr)) {
-IO
+Value
-                                return -1;
-                        }
@@ -243 +235 @@
-
-                if (!(wiimote = cwiid_open(&bdaddr, flags))) {
-
+
+
-                        return -1;
-                }
@@ -259 +252 @@
-{
-        if (cwiid_close(self->wiimote)) {
-
+
+
-                self->wiimote = NULL;
-                return NULL;
@@ -279 +273 @@
-
-        if (cwiid_enable(self->wiimote, flags)) {
-IOError, "cwiid_enable error
+RuntimeError, "Error enabling wiimote flags
-                return NULL;
-        }
@@ -297 +291 @@
-
-        if (cwiid_disable(self->wiimote, flags)) {
-IOError, "cwiid_disable error
+RuntimeError, "Error disabling wiimote flags
-                return NULL;
-        }
@@ -317 +311 @@
-        if ((OldCallback == Py_None) && (NewCallback != Py_None)) {
-                if (cwiid_set_mesg_callback(self->wiimote, CallbackBridge)) {
-
+
+
-                        return -1;
-                }
@@ -323 +318 @@
-        else if ((OldCallback != Py_None) && (NewCallback == Py_None)) {
-                if (cwiid_set_mesg_callback(self->wiimote, NULL)) {
-
+
+
-                        return -1;
-                }
@@ -347 +343 @@
-                }
-                else {
-
+
+
-                        return NULL;
-                }
@@ -541 +538 @@
-
-        if (cwiid_get_acc_cal(self->wiimote, ext_type, &acc_cal)) {
-
+
+
-                return NULL;
-        }
@@ -558 +556 @@
-{
-        if (cwiid_request_status(self->wiimote)) {
-IOError, "Wiimote request status error
+RuntimeError, "Error requesting wiimote status
-                return NULL;
-        }
@@ -574 +572 @@
-
-        if (cwiid_set_led(self->wiimote, (uint8_t)led)) {
-
+
+
-                return -1;
-        }
@@ -591 +590 @@
-
-        if (cwiid_set_rumble(self->wiimote, (uint8_t)rumble)) {
-
+
+
-                return -1;
-        }
@@ -608 +608 @@
-
-        if (cwiid_set_rpt_mode(self->wiimote, (uint8_t)rpt_mode)) {
-
+
+
-                return -1;
-        }
@@ -653 +654 @@
-        }
-        if (cwiid_read(self->wiimote,flags,offset,len,buf)) {
-IOError, "Wiimote read error
+RuntimeError, "Error reading wiimote data
-                Py_DECREF(pyRetBuf);
-                return NULL;
@@ -675 +676 @@
-
-        if (cwiid_write(self->wiimote, flags, offset, len, buf)) {
-IOError, "Wiimote write error
+RuntimeError, "Error writing wiimote data
-                return NULL;
-        }

trunk/wminput/conf.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * revised error messages
+ *
- *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * refactored to isolate plugin logic
@@ -71 +74 @@
-        if (yyparse()) {
-                if (fclose(yyin)) {
-e
+E
-                }
-                conf_unload(cur_conf);
@@ -488 +491 @@
-
-        if (conf->stack_index+1 >= CONF_MAX_INCLUDE_DEPTH) {
-m
+M
-                return NULL;
-        }
@@ -512 +515 @@
-
-        if (!file) {
-f
+F
-                return NULL;
-        }
@@ -519 +522 @@
-        if ((conf->config_filename_stack[conf->stack_index] =
-          malloc(strlen(stackname) + 1)) == NULL) {
-out of memory
+Error allocating pathname
-                conf->stack_index--;
-                return NULL;
@@ -581 +584 @@
-
-        if (i == CONF_MAX_PLUGINS) {
-m
+M
-                return NULL;
-        }
@@ -600 +603 @@
-
-        if (!plugin_found) {
-p
+P
-                free(plugin->name);
-                plugin->name = NULL;

trunk/wminput/main.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * revised error messages
+ *
- *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * refactored to isolate plugin logic
@@ -165 +168 @@
-        /* Setup search directory arrays */
-        if ((tmp = getenv("HOME")) == NULL) {
-u
+U
-                config_search_dirs[0] = WMINPUT_CONFIG_DIR;
-                plugin_search_dirs[0] = CWIID_PLUGINS_DIR;
@@ -294 +297 @@
-
-        if (pthread_cancel(uinput_listen_thread)) {
-e
+E
-                ret = -1;
-        }
-        else if (pthread_join(uinput_listen_thread, NULL)) {
-error jo
+Error join
-                ret = -1;
-        }
@@ -304 +307 @@
-        /* disconnect */
-        if (cwiid_close(wiimote)) {
-error on
+Error on wiimote
-                ret = -1;
-        }
@@ -329 +332 @@
-
-        if (cwiid_set_rpt_mode(wiimote, rpt_mode_flags)) {
-e
+E
-                return -1;
-        }
@@ -365 +368 @@
-                case CWIID_MESG_ERROR:
-                        if (kill(getpid(),SIGINT)) {
-e
+E
-                        }
-                        break;

trunk/wminput/py_plugin.c

@@ -16 +16 @@
- *
- *  ChangeLog:
+ *  2007-06-18 L. Donnie Smith <cwiid@abstrakraft.org>
+ *  * revised error messages
+ *
- *  2007-06-05 L. Donnie Smith <cwiid@abstrakraft.org>
- *  * relocated all python plugin logic here
@@ -75 +78 @@
-{
-        {"set_rpt_mode", (PyCFunction)set_rpt_mode, METH_VARARGS | METH_KEYWORDS,
-
+_rpt_mode(id, rpt_mode)\n\nset the
-        {NULL, NULL, 0, NULL}
-};
@@ -111 +114 @@
-        /* note: PyWmPluginModule is a borrowed reference - do not decref */
-        if (!(PyWmPluginModule = Py_InitModule3("wmplugin", Module_Methods,
-"plugin interface for wminput
+ "wminput plugin interface
-                PyErr_Print();
-                goto ERR_HND;
@@ -124 +127 @@
-                }
-        }
-
-        PyRun_SimpleString("import sys; sys.path.append('.')");
-
-        return 0;
@@ -227 +228 @@
-
-        if (!(plugin->p = malloc(sizeof(struct py_plugin)))) {
-malloc error
+Error allocating py_plugin
-                return -1;
-        }
@@ -238 +239 @@
-
-        if (!(plugin->info = malloc(sizeof *plugin->info))) {
-malloc error
+Error allocating plugin info
-                goto ERR_HND;
-        }
-        if (!(plugin->data = malloc(sizeof *plugin->data))) {
-malloc error
+Error allocating plugin data
-                goto ERR_HND;
-        }
@@ -273 +274 @@
-        }
-        if (py_plugin_info(plugin, info)) {
-python_info error
+Error on python_info
-                Py_DECREF((PyObject *)info);
-                goto ERR_HND;
@@ -334 +335 @@
-        if (!(PySequence_Check(PyButtonInfo) && PySequence_Check(PyAxisInfo) &&
-              PySequence_Check(PyParamInfo))) {
-
+Type error in wminput_info: 
-                goto ERR_HND;
-        }
@@ -463 +464 @@
-
-        if (!(PySequence_Check(PyButtonData) && PySequence_Check(PyAxisData))) {
-
+Type error on wminput_exec: 
-                Py_DECREF(PyData);
-                return -1;
@@ -469 +470 @@
-
-        if (PySequence_Size(PyButtonData) != plugin->info->button_count) {
-exec
+Type error on wminput_exec:
-                Py_DECREF(PyData);
-                return -1;
@@ -485 +486 @@
-                }
-                else if (PyObj != Py_False) {
-exec
+Type error on wminput_exec:
-                        Py_DECREF(PyObj);
-                        Py_DECREF(PyData);
@@ -495 +496 @@
-
-        if (PySequence_Size(PyAxisData) != plugin->info->axis_count) {
-exec
+Error on wminput_exec:
-                Py_DECREF(PyData);
-                return -1;
@@ -510 +511 @@
-                }
-                else if (!PyInt_Check(PyObj)) {
-exec
+Type error on wminput_exec:
-                        Py_DECREF(PyObj);
-                        Py_DECREF(PyData);