Changeset de8c420b for lib/trace.c

Timestamp:

09/07/05 16:13:48 (16 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5bbe424

Parents:

084d95a

Message:

Placed uri splitting code into its own function and made that function available for external use

File:

• lib/trace.c (modified) (7 diffs)

lib/trace.c

@@ -237 +237 @@
 struct libtrace_t *trace_create(char *uri) {
         struct libtrace_t *libtrace = malloc(sizeof(struct libtrace_t));
-        char *scan = calloc(sizeof(char),URI_PROTO_LINE);
+        char *scan = 0;
         char *uridata = 0;                  
         int i = 0;
@@ -244 +244 @@
         trace_err.err_num = E_NOERROR;
         
-        
+        //scan = calloc(sizeof(char),URI_PROTO_LINE);   
         // parse the URI to determine what sort of event we are dealing with
        
-        // want snippet before the : to get the uri base type.
-
-        if((uridata = strchr(uri,':')) == NULL) {
-                // badly formed URI - needs a :
-                trace_err.err_num = E_URI_NOCOLON;
-                return 0;
-        }
-
-
-        if ((uridata - uri) > URI_PROTO_LINE) {
-                // badly formed URI - uri type is too long
-                trace_err.err_num = E_URI_LONG;
-                return 0;
-        }
-        strncpy(scan,uri, (uridata - uri));
-
+        if ((uridata = trace_parse_uri(uri, &scan)) == 0) {
+                return 0;
+        }
+        
         libtrace->event.tdelta = 0.0;
-
 
         libtrace->format = 0;
@@ -282 +269 @@
         }
 
-        // push uridata past the delimiter
-        uridata++;
         libtrace->uridata = strdup(uridata);
 
@@ -353 +338 @@
         struct libtrace_out_t *libtrace = malloc(sizeof(struct libtrace_out_t));
         
-        char *scan = calloc(sizeof(char),URI_PROTO_LINE);
+        char *scan = 0;
         char *uridata = 0;
         int i;
@@ -360 +345 @@
         // parse the URI to determine what sort of event we are dealing with
 
-        // want snippet before the : to get the uri base type.
-
-        if((uridata = strchr(uri,':')) == NULL) {
-                // badly formed URI - needs a :
-                trace_err.err_num = E_URI_NOCOLON;
-                return 0;
-        }
-
-        if ((uridata - uri) > URI_PROTO_LINE) {
-                // badly formed URI - uri type is too long
-                trace_err.err_num = E_URI_LONG;
-                return 0;
-        }
-
-        strncpy(scan,uri, (uridata - uri));
-
+        if ((uridata = trace_parse_uri(uri, &scan)) == 0) {
+                return 0;
+        }
+        
+        
         libtrace->format = 0;
         for (i = 0; i < nformats; i++) {
@@ -391 +365 @@
                 return 0;
         }
-
-        // push uridata past the delimiter
-        uridata++;
         libtrace->uridata = strdup(uridata);
 
@@ -1324 +1295 @@
 }
 
+char * trace_parse_uri(char *uri, char **format) {
+        char *uridata = 0;
+        
+        *format = calloc(sizeof(char), URI_PROTO_LINE);
+        
+        if((uridata = strchr(uri,':')) == NULL) {
+                // badly formed URI - needs a :
+                trace_err.err_num = E_URI_NOCOLON;
+                return 0;
+        }
+
+        if ((uridata - uri) > URI_PROTO_LINE) {
+                // badly formed URI - uri type is too long
+                trace_err.err_num = E_URI_LONG;
+                return 0;
+        }
+
+        strncpy(*format ,uri, (uridata - uri));
+        // push uridata past the delimiter
+        uridata++;
+        return uridata;
+}
+