diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-11 20:24:38 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-11 20:24:38 +0000 |
| commit | 69c069069addb50f8fad2a388095b02ee8b34a68 (patch) | |
| tree | 59ed13811aaef196aa8649fedf0a41e138516388 /navit/map | |
| parent | 413c26cb56e84969988cd0a96f52fd9dabded3f5 (diff) | |
| download | navit-69c069069addb50f8fad2a388095b02ee8b34a68.tar.gz | |
Fix:core:Fix warnings from unused variables.|Part of #1154.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5564 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/map')
| -rw-r--r-- | navit/map/csv/csv.c | 2 | ||||
| -rw-r--r-- | navit/map/shapefile/shapefile.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/navit/map/csv/csv.c b/navit/map/csv/csv.c index f60f99563..9aedd0029 100644 --- a/navit/map/csv/csv.c +++ b/navit/map/csv/csv.c @@ -672,7 +672,6 @@ static struct map_priv * map_new_csv(struct map_methods *meth, struct attr **attrs, struct callback_list *cbl) { struct map_priv *m = NULL; - struct attr *item_type; struct attr *attr_types; struct attr *item_type_attr; struct attr *data; @@ -688,7 +687,6 @@ map_new_csv(struct map_methods *meth, struct attr **attrs, struct callback_list m->qitem_hash = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, quadtree_item_free_do); m->tree_root = tree_root; - item_type = attr_search(attrs, NULL, attr_item_type); attr_types = attr_search(attrs, NULL, attr_attr_types); if(attr_types) { enum attr_type* at = attr_types->u.attr_types; diff --git a/navit/map/shapefile/shapefile.c b/navit/map/shapefile/shapefile.c index 03f223cd4..7f4872d62 100644 --- a/navit/map/shapefile/shapefile.c +++ b/navit/map/shapefile/shapefile.c @@ -367,30 +367,25 @@ static void process_fields(struct map_priv *m, int id) { int i; - char szTitle[12],*pszTypeName,*str; + char szTitle[12],*str; int nWidth, nDecimals; for (i = 0 ; i < m->nFields ; i++) { switch (DBFGetFieldInfo(m->hDBF, i, szTitle, &nWidth, &nDecimals )) { case FTString: - pszTypeName = "String"; str=g_strdup(DBFReadStringAttribute( m->hDBF, id, i )); break; case FTInteger: - pszTypeName = "Integer"; str=g_strdup_printf("%d",DBFReadIntegerAttribute( m->hDBF, id, i )); break; case FTDouble: - pszTypeName = "Double"; str=g_strdup_printf("%lf",DBFReadDoubleAttribute( m->hDBF, id, i )); break; case FTInvalid: - pszTypeName = "Invalid"; str=NULL; break; default: - pszTypeName = "Unknown"; str=NULL; } longest_match_add_key_value(m->lm, szTitle, str); |