getdata-commits

[Getdata-commits] SF.net SVN: getdata:[670] trunk/defile/lib/libdefile.c

[<ket...@us...>]

Revision: 670
          http://getdata.svn.sourceforge.net/getdata/?rev=670&view=rev
Author:   ketiltrout
Date:     2012-03-12 22:35:14 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Clean compiler warnings.

Modified Paths:
--------------
    trunk/defile/lib/libdefile.c

Modified: trunk/defile/lib/libdefile.c
===================================================================
--- trunk/defile/lib/libdefile.c	2012-03-12 22:18:31 UTC (rev 669)
+++ trunk/defile/lib/libdefile.c	2012-03-12 22:35:14 UTC (rev 670)
@@ -352,13 +352,13 @@
     c = fd->field[i].cadence ? fd->field[i].cadence : z;
     if (c < z) {
       fprintf(stderr, "libdefile: internal frame definition error in input "
-          "plugin: datatype size exceeds cadence (%i > %i)\n", z, c);
+          "plugin: datatype size exceeds cadence (%zu > %zu)\n", z, c);
       return DF_INPUT;
     }
 
     if (fd->field[i].offset + (fd->field[i].spf - 1) * c + z > fd->framesize) {
       fprintf(stderr, "libdefile: internal frame definition error in input "
-          "plugin: data extends beyond end of frame (%i > %i)\n",
+          "plugin: data extends beyond end of frame (%zu > %zu)\n",
           fd->field[i].offset + (fd->field[i].spf - 1) * c + z, fd->framesize);
       return DF_INPUT;
     }
@@ -423,7 +423,7 @@
         fprintf(stderr, "defile:     %i: (excluded)\n", i);
       } else {
         fprintf(stderr,
-            "defile:     %i: \"%s\" (=r%i) %zix%i bytes @ %lli,%zi\n", i,
+            "defile:     %i: \"%s\" (=r%i) %ux%i bytes @ %lli,%zi\n", i,
             df->raw[f->index].name, f->index, f->spf,
             GD_SIZE(df->raw[f->index].type), (long long)f->offset, f->cadence);
       }

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

[Getdata-commits] SF.net SVN: getdata:[721] trunk/defile/lib/libdefile.c

[<ket...@us...>]

Revision: 721
          http://getdata.svn.sourceforge.net/getdata/?rev=721&view=rev
Author:   ketiltrout
Date:     2012-06-05 23:12:09 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
gd_tokenise -> gs_strtok

Modified Paths:
--------------
    trunk/defile/lib/libdefile.c

Modified: trunk/defile/lib/libdefile.c
===================================================================
--- trunk/defile/lib/libdefile.c	2012-06-05 00:50:13 UTC (rev 720)
+++ trunk/defile/lib/libdefile.c	2012-06-05 23:12:09 UTC (rev 721)
@@ -199,7 +199,7 @@
 
   /* skip fields we've been asked to exclude, this requires isolating the
    * field name; use GetData's parser to do this. */
-  name = gd_tokenise(df->D, spec);
+  name = gd_strtok(df->D, spec);
   if (name == NULL) {
     if (gd_error(df->D) == GD_E_ALLOC)
       return DF_OUTPUT; /* better to just fold this into gd_add_spec failures
@@ -214,7 +214,7 @@
   }
 
   /* check the second token to see if it's a RAW field */
-  type = gd_tokenise(df->D, NULL);
+  type = gd_strtok(df->D, NULL);
   if (type && strcmp(type, "RAW") == 0) {
     fputs("libdefile: Attempt to define RAW field via df_add_spec().\n",
         stderr);

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

[Getdata-commits] SF.net SVN: getdata:[810] trunk/defile/lib/libdefile.c

[<ket...@us...>]

Revision: 810
          http://sourceforge.net/p/getdata/code/810
Author:   ketiltrout
Date:     2013-03-09 05:07:16 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
Always send an input designator to clients.

Modified Paths:
--------------
    trunk/defile/lib/libdefile.c

Modified: trunk/defile/lib/libdefile.c
===================================================================
--- trunk/defile/lib/libdefile.c	2013-03-09 04:57:19 UTC (rev 809)
+++ trunk/defile/lib/libdefile.c	2013-03-09 05:07:16 UTC (rev 810)
@@ -1040,7 +1040,8 @@
     if (hello && df_rpc_push(df->srv_slug, DF_RPC_HELLO))
       return DF_OUTPUT;
 
-    if (df_rpc_push(df->srv_slug, DF_RPC_INIT, length, rate, name))
+    if (df_rpc_push(df->srv_slug, DF_RPC_INIT, length, rate, name ? name 
+          : df->input))
       return DF_OUTPUT;
   }
   return DF_SUCCESS;

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