curl: convert to generic object payload

diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c
index c26487e..d69e860 100644 (file)
--- a/src/ccurl_thread.c
+++ b/src/ccurl_thread.c
@@ -184,6 +184,11 @@ void *ccurl_thread(void *arg)
  * This is where the $curl section begins.
  */
 
+struct curl_data {
+       char uri[128];
+       float interval;
+};
+
 /* internal location pointer for use by $curl, no touchy */
 static ccurl_location_t *ccurl_locations_head = 0;
 
@@ -221,24 +226,37 @@ void ccurl_process_info(char *p, int p_max_size, char *uri, int interval)
 void curl_parse_arg(struct text_object *obj, const char *arg)
 {
        int argc;
+       struct curl_data *cd;
        float interval = 0;
-       char *uri = (char *) malloc(128 * sizeof(char));
 
-       argc = sscanf(arg, "%127s %f", uri, &interval);
+       cd = malloc(sizeof(struct curl_data));
+       memset(cd, 0, sizeof(struct curl_data));
+
+       argc = sscanf(arg, "%127s %f", cd->uri, &interval);
        if (argc < 1) {
-               free(uri);
+               free(cd);
                NORM_ERR("wrong number of arguments for $curl");
                return;
        }
-       obj->data.curl.uri = uri;
-       obj->data.curl.interval = interval > 0 ? interval * 60 : 15*60;
+       cd->interval = interval > 0 ? interval * 60 : 15*60;
+       obj->data.opaque = cd;
 }
 
 void curl_print(struct text_object *obj, char *p, int p_max_size)
 {
-       if (!obj->data.curl.uri) {
+       struct curl_data *cd = obj->data.opaque;
+
+       if (!cd || !cd->uri) {
                NORM_ERR("error processing Curl data");
                return;
        }
-       ccurl_process_info(p, p_max_size, obj->data.curl.uri, obj->data.curl.interval);
+       ccurl_process_info(p, p_max_size, cd->uri, cd->interval);
+}
+
+void curl_obj_free(struct text_object *obj)
+{
+       if (obj->data.opaque) {
+               free(obj->data.opaque);
+               obj->data.opaque = NULL;
+       }
 }

diff --git a/src/ccurl_thread.h b/src/ccurl_thread.h
index 594479c..1449075 100644 (file)
--- a/src/ccurl_thread.h
+++ b/src/ccurl_thread.h
@@ -68,6 +68,7 @@ void ccurl_process_info(char *p, int p_max_size, char *uri, int interval);
 
 void curl_parse_arg(struct text_object *, const char *);
 void curl_print(struct text_object *, char *, int);
+void curl_obj_free(struct text_object *);
 
 /* $curl exports end */
 

diff --git a/src/core.c b/src/core.c
index becdbd6..a405165 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -1549,7 +1549,7 @@ void free_text_objects(struct text_object *root, int internal)
 #endif
 #ifdef HAVE_CURL
                        case OBJ_curl:
-                               free(data.curl.uri);
+                               curl_obj_free(obj);
                                break;
 #endif
 #ifdef RSS

diff --git a/src/text_object.h b/src/text_object.h
index a29e153..92c6a51 100644 (file)
--- a/src/text_object.h
+++ b/src/text_object.h
@@ -487,12 +487,6 @@ struct text_object {
                struct {
                        int a, b;
                } pair;                 /* 2 */
-#ifdef HAVE_CURL
-               struct {
-                       char *uri;
-                       float interval;
-               } curl;
-#endif
                struct {
                        char *text;
                        unsigned int show;