[recutils] Add missing sources

Daiki Ueno ueno at fedoraproject.org
Thu Mar 27 10:27:46 UTC 2014


commit 2e14f15a79730d713c16ef269d7bc56454b9a89e
Author: Daiki Ueno <dueno at redhat.com>
Date:   Thu Mar 27 19:27:38 2014 +0900

    Add missing sources

 .gitignore             |    1 +
 recutils-Wformat.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 sources                |    2 +-
 3 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd7baa0..d5b6972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /recutils-1.4.tar.gz
 /recutils-1.5.tar.gz
 /recutils-1.6.tar.gz
+/recutils-1.7.tar.gz
diff --git a/recutils-Wformat.patch b/recutils-Wformat.patch
new file mode 100644
index 0000000..b407526
--- /dev/null
+++ b/recutils-Wformat.patch
@@ -0,0 +1,42 @@
+From 090c51100809b4c62d9e53795a034792232dc2cf Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at gnu.org>
+Date: Thu, 27 Mar 2014 19:12:42 +0900
+Subject: [PATCH] utils: silence compiler warnings with -Wformat
+
+---
+ utils/csv2rec.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/utils/csv2rec.c b/utils/csv2rec.c
+index da38394..5b8806d 100644
+--- a/utils/csv2rec.c
++++ b/utils/csv2rec.c
+@@ -248,7 +248,6 @@ field_cb (void *s, size_t len, void *data)
+         {
+           if (ctx->num_fields > ctx->num_field_names)
+             {
+-              char *errmsg = NULL;
+               char *source = csv2rec_csv_file;
+ 
+               if (!source)
+@@ -256,13 +255,10 @@ field_cb (void *s, size_t len, void *data)
+                   source = "stdin";
+                 }
+ 
+-              if (!asprintf (&errmsg,
+-                             _("%s: %d: this line contains %d fields, but %d header fields were read\n"),
+-                             source,
+-                             ctx->lineno, ctx->num_field_names, ctx->num_fields))
+-                recutl_out_of_memory ();
+-
+-              fprintf (stderr, errmsg);
++              fprintf (stderr,
++                       _("%s: %lu: this line contains %lu fields, but %lu header fields were read\n"),
++                       source,
++                       ctx->lineno, ctx->num_field_names, ctx->num_fields);
+               exit (EXIT_FAILURE);
+             }
+           field = rec_field_new (ctx->field_names[ctx->num_fields], str);
+-- 
+1.8.4.2
+
diff --git a/sources b/sources
index 8548f29..d773383 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87524a97e64c6bccdbb52c9df7f0c913  recutils-1.6.tar.gz
+187e90421cdf69ce649876324a20b452  recutils-1.7.tar.gz


More information about the scm-commits mailing list