Thread: [Openhpi-svn] SF.net SVN: openhpi:[7427] openhpi/trunk (Page 6)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7427
          http://openhpi.svn.sourceforge.net/openhpi/?rev=7427&view=rev
Author:   avpak
Date:     2012-05-02 13:41:05 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Fix for #3523021

Modified Paths:
--------------
    openhpi/trunk/openhpi.conf.example
    openhpi/trunk/openhpid/conf.c

Modified: openhpi/trunk/openhpi.conf.example
===================================================================

--- openhpi/trunk/openhpi.conf.example	2012-05-02 12:18:02 UTC (rev 7426)
+++ openhpi/trunk/openhpi.conf.example	2012-05-02 13:41:05 UTC (rev 7427)
@@ -18,6 +18,12 @@
 #OPENHPI_DAT_SAVE = "NO"
 #OPENHPI_PATH = "/usr/local/lib/openhpi:/usr/lib/openhpi"
 #OPENHPI_VARPATH = "/usr/local/var/lib/openhpi"
+
+## Auto insertion timeout
+## Use "BLOCK" or "IMMEDIATE" or positive integer value
+## Negative integer value shall be quoted due to Glib scanner limitation
+## For example "-1".
+## All negative values will be interpreted as "BLOCK"
 #OPENHPI_AUTOINSERT_TIMEOUT = 0
 #OPENHPI_AUTOINSERT_TIMEOUT_READONLY = "YES"
 

Modified: openhpi/trunk/openhpid/conf.c
===================================================================
--- openhpi/trunk/openhpid/conf.c	2012-05-02 12:18:02 UTC (rev 7426)
+++ openhpi/trunk/openhpid/conf.c	2012-05-02 13:41:05 UTC (rev 7427)
@@ -19,6 +19,7 @@
  *     Bryan Sutula <su...@us...>
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -163,6 +164,7 @@
                 TRUE                    /* char_2_token */,
                 TRUE                    /* symbol_2_token */,
                 FALSE                   /* scope_0_fallback */,
+                TRUE                    /* store_int64 */,
         };
 
 static void process_global_param(const char *name, char *value)
@@ -209,7 +211,16 @@
                         global_params.unconfigured = SAHPI_FALSE;
                 }
         } else if (!strcmp("OPENHPI_AUTOINSERT_TIMEOUT", name)) {
-                global_params.ai_timeout = strtoll(value, 0, 10);
+                if (!strcmp(value, "BLOCK")) {
+                    global_params.ai_timeout = SAHPI_TIMEOUT_BLOCK;
+                } else if (!strcmp(value, "IMMEDIATE")) {
+                    global_params.ai_timeout = SAHPI_TIMEOUT_IMMEDIATE;
+                } else {
+                    global_params.ai_timeout = strtoll(value, 0, 10);
+                    if (global_params.ai_timeout < 0) {
+                        global_params.ai_timeout = SAHPI_TIMEOUT_BLOCK;
+                    }
+                }
         } else if (!strcmp("OPENHPI_AUTOINSERT_TIMEOUT_READONLY", name)) {
                 if (!strcmp("YES", value)) {
                         global_params.ai_timeout_readonly = SAHPI_TRUE;
@@ -316,10 +327,18 @@
                         int current_token = g_scanner_get_next_token(oh_scanner);
 
                         if (current_token == G_TOKEN_INT) {
+                                // TODO seems everyone now relies that 
+                                // value shall be string.
+                                // So this code may break a plug-in expectations.
+                                // Investigate
                                 gulong *value_int = g_new0(gulong, 1);
-                                *value_int = oh_scanner->value.v_int;
+                                *value_int = (gulong)oh_scanner->value.v_int64;
                                 value = (gpointer)value_int;
                         } else if (current_token == G_TOKEN_FLOAT) {
+                                // TODO seems everyone now relies that 
+                                // value shall be string.
+                                // So this code may break a plug-in expectations.
+                                // Investigate
                                 gdouble *value_float = g_new0(gdouble, 1);
                                 *value_float = oh_scanner->value.v_float;
                                 value = (gpointer)value_float;
@@ -408,15 +427,9 @@
         }
 
         if (current_token == G_TOKEN_INT) {
-                guint num_chars = 0, result;
-                result = scanner->value.v_int;
-                while (result) {
-                        result = result / 10;
-                        num_chars++;
-                }
-                value = (char *)g_malloc0(++num_chars);
-                result = scanner->value.v_int;
-                snprintf(value, num_chars, "%u", result);
+                const guint max_digits = 32; // More than enough for uint64.
+                value = (char *)g_malloc0(max_digits);
+                snprintf(value, max_digits, "%" PRIu64, scanner->value.v_int64);
         } else {
                 value = g_strdup(scanner->value.v_string);
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Openhpi-svn] SF.net SVN: openhpi:[7427] openhpi/trunk (Page 6)

openhpi-svn