From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 13 May 2014 16:42:17 +0000 (+0000)
Subject: Roman I Khimov:
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b1ea0240520ad3d1e6e10174c3000f2ea12dff9;p=file

Roman I Khimov:
Remove useless assignments found by clang static analysis.
---

diff --git a/src/apprentice.c b/src/apprentice.c
index 25ba606f..2c19154e 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.208 2014/05/06 16:07:23 christos Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.209 2014/05/13 16:42:17 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -783,7 +783,6 @@ apprentice_magic_strength(const struct magic *m)
 		break;
 
 	default:
-		val = 0;
 		(void)fprintf(stderr, "Bad type %d\n", m->type);
 		abort();
 	}
diff --git a/src/softmagic.c b/src/softmagic.c
index 297d97a0..4a0bbc9c 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: softmagic.c,v 1.186 2014/05/05 20:53:10 christos Exp $")
+FILE_RCSID("@(#)$File: softmagic.c,v 1.187 2014/05/13 16:42:17 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -1835,7 +1835,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 			break;
 
 		default:
-			matched = 0;
 			file_magerror(ms, "cannot happen with float: invalid relation `%c'",
 			    m->reln);
 			return -1;
@@ -1869,7 +1868,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 			break;
 
 		default:
-			matched = 0;
 			file_magerror(ms, "cannot happen with double: invalid relation `%c'", m->reln);
 			return -1;
 		}
@@ -2062,7 +2060,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 		break;
 
 	default:
-		matched = 0;
 		file_magerror(ms, "cannot happen: invalid relation `%c'",
 		    m->reln);
 		return -1;