[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-recutils] [PATCH] Fix some build warnings
From: |
Giuseppe Scrivano |
Subject: |
[bug-recutils] [PATCH] Fix some build warnings |
Date: |
Thu, 15 Aug 2013 19:40:28 +0200 |
---
ChangeLog | 25 +++++++++++++++++++++++++
src/rec-aggregate.c | 6 +++---
src/rec-db.c | 3 ---
src/rec-fex.c | 2 +-
src/rec-int.c | 2 --
src/rec-mset.c | 11 -----------
src/rec-rset.c | 3 ---
src/rec-sex-ast.c | 2 +-
src/rec-sex-lex.l | 4 +++-
src/rec-sex-parser.c | 2 ++
src/rec-sex-tab.y | 2 ++
11 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 67e2bd0..9d427a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2013-08-15 Giuseppe Scrivano <address@hidden>
+
+ * src/rec-aggregate.c (rec_aggregate_std_count): Fix formatting string.
+ (rec_aggregate_std_avg): Likewise.
+ (REC_AGGREGATE_ACCUM_FUNC): Likewise.
+ * src/rec-fex.c (rec_fex_parse_str_simple): Wrap assignment in if
+ statement in parentheses.
+ * src/rec-sex-lex.l (top): Specify options header-file, noinput and
+ nounput.
+ (rec_sex_lex_extract_subname): Remove unused variable `res'.
+ * src/rec-sex-tab.y: Include "rec-sex-lex.h".
+ * src/rec-sex-ast.c (rec_sex_ast_print_node): Use name[0] to access the
+ name.
+ * src/rec-sex-parser.c: Include "rec-sex-lex.h" and "rec-sex-tab.h".
+ * src/rec-sex-lex.l: Generate the header file "rec-sex-lex.h".
+ * src/rec-int.c (rec_int_check_field_type): Removed unused variable
+ `field_name'.
+ * src/rec-db.c (rec_db_query): Removed unused variable `selected'.
+ (rec_db_query): Removed unused variable `n_rset'.
+ Remove declaration for the static function `rec_db_set_act_setadd'.
+ * src/rec-rset.c (rec_rset_record_compare_fn): Removed unused variables
+ `field1' and `field2'.
+ (rec_rset_update_field_props): Removed unused variable `type_name'.
+ * src/rec-mset.c (rec_mset_elem_init): Remove unused function.
+
2013-08-08 Jose E. Marchesi <address@hidden>
src: optimize the evaluation of sex expressions, avoiding
diff --git a/src/rec-aggregate.c b/src/rec-aggregate.c
index 0fa1935..0f5858b 100644
--- a/src/rec-aggregate.c
+++ b/src/rec-aggregate.c
@@ -254,7 +254,7 @@ rec_aggregate_std_count (rec_rset_t rset,
will be returned by this function below to signal the
end-of-memory condition. */
- asprintf (&result, "%ld", count);
+ asprintf (&result, "%zu", count);
return result;
}
@@ -294,7 +294,7 @@ rec_aggregate_std_avg (rec_rset_t rset,
if (avg == floor (avg))
{
- asprintf (&result, "%ld", (size_t) avg);
+ asprintf (&result, "%zu", (size_t) avg);
}
else
{
@@ -365,7 +365,7 @@ rec_aggregate_std_avg_record (rec_record_t record,
\
if (val == floor (val)) \
{ \
- asprintf (&result, "%ld", (size_t) val); \
+ asprintf (&result, "%zu", (size_t) val); \
} \
else \
{ \
diff --git a/src/rec-db.c b/src/rec-db.c
index 46ce93b..2a4f25b 100644
--- a/src/rec-db.c
+++ b/src/rec-db.c
@@ -69,7 +69,6 @@ static bool rec_db_index_p (size_t *index, size_t num);
static bool rec_db_set_act_rename (rec_rset_t rset, rec_record_t record,
rec_fex_t fex, bool rename_descriptor, const char *arg);
static bool rec_db_set_act_set (rec_rset_t rset, rec_record_t record,
rec_fex_t fex, bool xxx, const char *arg);
static bool rec_db_set_act_add (rec_rset_t rset, rec_record_t record,
rec_fex_t fex, const char *arg);
-static bool rec_db_set_act_setadd (rec_rset_t rset, rec_record_t record,
rec_fex_t fex, const char *arg);
static bool rec_db_set_act_delete (rec_rset_t rset, rec_record_t record,
rec_fex_t fex, bool comment_out);
static rec_rset_t rec_db_join (rec_db_t db, const char *type1, const char
*field, const char *type2);
@@ -280,7 +279,6 @@ rec_db_query (rec_db_t db,
{
rec_rset_t res = NULL;
rec_rset_t rset = NULL;
- size_t n_rset = 0;
/* Create a new, empty, record set, that will contain the contents
of the selection. */
@@ -436,7 +434,6 @@ rec_db_query (rec_db_t db,
while (rec_mset_iterator_next (&iter, MSET_RECORD, (const void **)
&record, NULL))
{
rec_record_t res_record;
- bool selected = false;
num_rec++;
/* Determine whether we must skip this record. */
diff --git a/src/rec-fex.c b/src/rec-fex.c
index c93379c..6c6b5ab 100644
--- a/src/rec-fex.c
+++ b/src/rec-fex.c
@@ -555,7 +555,7 @@ rec_fex_parse_str_simple (rec_fex_t new,
{
if (strlen (elem_str) > 0)
{
- if (elem = malloc (sizeof (struct rec_fex_elem_s)))
+ if ((elem = malloc (sizeof (struct rec_fex_elem_s))))
{
const char *p = elem_str;
diff --git a/src/rec-int.c b/src/rec-int.c
index d8aa7cd..e64df9f 100644
--- a/src/rec-int.c
+++ b/src/rec-int.c
@@ -244,13 +244,11 @@ rec_int_check_field_type (rec_db_t db,
rec_buf_t errors)
{
bool res = true;
- const char *field_name = NULL;
rec_type_t type;
char *errors_str;
res = true;
- field_name = rec_field_name (field);
/* Get the proper type to check 'field' with, checking with the type
from the type registry of 'rset', if any. */
diff --git a/src/rec-mset.c b/src/rec-mset.c
index f15c294..5a907ba 100644
--- a/src/rec-mset.c
+++ b/src/rec-mset.c
@@ -73,7 +73,6 @@ struct rec_mset_s
*/
static void rec_mset_init (rec_mset_t mset);
-static void rec_mset_elem_init (rec_mset_elem_t elem);
static bool rec_mset_elem_equal_fn (const void *e1,
const void *e2);
@@ -780,16 +779,6 @@ rec_mset_init (rec_mset_t mset)
memset (mset, 0 /* NULL */, sizeof (struct rec_mset_s));
}
-static void
-rec_mset_elem_init (rec_mset_elem_t elem)
-{
- /* Initialize the mset_elem structure so it can be safely passed to
- rec_mset_elem_destroy even if its contents are not completely
- initialized with real values. */
-
- memset (elem, 0 /* NULL */, sizeof (struct rec_mset_elem_s));
-}
-
static bool
rec_mset_elem_equal_fn (const void *e1,
const void *e2)
diff --git a/src/rec-rset.c b/src/rec-rset.c
index ce4582c..61560a6 100644
--- a/src/rec-rset.c
+++ b/src/rec-rset.c
@@ -992,8 +992,6 @@ rec_rset_record_compare_fn (void *data1,
rec_rset_t rset = NULL;
rec_record_t record1 = NULL;
rec_record_t record2 = NULL;
- rec_field_t field1 = NULL;
- rec_field_t field2 = NULL;
int type_comparison = 0;
/* If elem2 is a comment then elem1 > elem2. */
@@ -1336,7 +1334,6 @@ rec_rset_update_field_props (rec_rset_t rset)
entries are just ignored. */
const char *field_value = rec_field_value (field);
- char *type_name = NULL;
rec_fex_t fex = rec_fex_new (field_value, REC_FEX_SIMPLE);
if (fex)
diff --git a/src/rec-sex-ast.c b/src/rec-sex-ast.c
index ec4469d..d2605e6 100644
--- a/src/rec-sex-ast.c
+++ b/src/rec-sex-ast.c
@@ -265,7 +265,7 @@ rec_sex_ast_print_node (rec_sex_ast_node_t node)
}
if (node->type == REC_SEX_NAME)
{
- printf("value: %s\n", node->val.name);
+ printf("value: %s\n", node->val.name[0]);
}
if (node->type == REC_SEX_STR)
{
diff --git a/src/rec-sex-lex.l b/src/rec-sex-lex.l
index 6535d86..55ef2e7 100644
--- a/src/rec-sex-lex.l
+++ b/src/rec-sex-lex.l
@@ -32,6 +32,9 @@
%option bison-bridge
%option extra-type="void *"
+%option header-file="rec-sex-lex.h"
+%option nounput
+%option noinput
%top {
/* This code goes at the "top" of the generated file. */
#include <config.h>
@@ -195,7 +198,6 @@ rec_sex_lex_extract_name (char *str)
char *
rec_sex_lex_extract_subname (char *str)
{
- char *res = NULL;
char *p;
/* If there is not a subname denoted in STR then this function
diff --git a/src/rec-sex-parser.c b/src/rec-sex-parser.c
index e0cf9c1..9df50fd 100644
--- a/src/rec-sex-parser.c
+++ b/src/rec-sex-parser.c
@@ -30,6 +30,8 @@
#include <stdio.h>
#include <rec-sex-parser.h>
+#include "rec-sex-tab.h"
+#include "rec-sex-lex.h"
/*
* Data types
diff --git a/src/rec-sex-tab.y b/src/rec-sex-tab.y
index 4fc58d7..d786e78 100644
--- a/src/rec-sex-tab.y
+++ b/src/rec-sex-tab.y
@@ -38,6 +38,8 @@
#include <rec-sex-ast.h>
#include <rec-sex-parser.h>
+ #include "rec-sex-tab.h"
+ #include "rec-sex-lex.h"
void sexerror (rec_sex_parser_t context, const char *err)
{
--
1.8.3.1
- [bug-recutils] [PATCH] Fix some build warnings,
Giuseppe Scrivano <=