summaryrefslogtreecommitdiff
path: root/audio/mp3_check
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-01-11 19:11:38 +0000
committerhans <hans@pkgsrc.org>2012-01-11 19:11:38 +0000
commit7147b14e290e649ca4e29761771e226bfcc5f8dd (patch)
tree8c835b1fe99ec14019fa08389eb70586e86d41cf /audio/mp3_check
parent5125e8b85eebbc5e53a38d8521fa72922d7b6137 (diff)
downloadpkgsrc-7147b14e290e649ca4e29761771e226bfcc5f8dd.tar.gz
Remove set but not used variable.
Diffstat (limited to 'audio/mp3_check')
-rw-r--r--audio/mp3_check/distinfo4
-rw-r--r--audio/mp3_check/patches/patch-ab38
2 files changed, 37 insertions, 5 deletions
diff --git a/audio/mp3_check/distinfo b/audio/mp3_check/distinfo
index ab54eae27c1..c005ef143d9 100644
--- a/audio/mp3_check/distinfo
+++ b/audio/mp3_check/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2011/09/04 04:42:40 dholland Exp $
+$NetBSD: distinfo,v 1.9 2012/01/11 19:11:38 hans Exp $
SHA1 (mp3_check-1.98.tar.gz) = 64f796d9b29fecb34ce05b05d75404aadd8fdb52
RMD160 (mp3_check-1.98.tar.gz) = d05203fdd1bc7079b6dfb71ed4f3b0ad074256b4
Size (mp3_check-1.98.tar.gz) = 83098 bytes
SHA1 (patch-aa) = a58c9a6ff729e9bc41b259146773a18440a41a8e
-SHA1 (patch-ab) = 91d2760874cecf7f6a718c93107ff753870e4b4f
+SHA1 (patch-ab) = 6bb21704b320a96eb9d18bb16348f8c9ab5c1af9
SHA1 (patch-ac) = 297f6315c44801764acae0b2f34ed1e05f6fefce
diff --git a/audio/mp3_check/patches/patch-ab b/audio/mp3_check/patches/patch-ab
index a530482092d..3305d4ca541 100644
--- a/audio/mp3_check/patches/patch-ab
+++ b/audio/mp3_check/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2011/09/04 04:42:41 dholland Exp $
+$NetBSD: patch-ab,v 1.3 2012/01/11 19:11:38 hans Exp $
- fix gcc/c99 inline mess
- initialize the uninitialized (not sure if this is necessary or just to
silence the compiler)
+- remove set but not used variable found_weak_header
--- mp3_check_misc.c.orig 2000-09-16 03:36:01.000000000 +0000
+++ mp3_check_misc.c
@@ -15,7 +16,38 @@ $NetBSD: patch-ab,v 1.2 2011/09/04 04:42:41 dholland Exp $
int get_char_from_file(FILE *, unsigned int *header_value, gen_info *file_info, command_flags *flags, char *possible_mp3_tag);
int scan_file(FILE *, char *filename, meta_options *flag_options, command_flags *flags);
int parse_args(char **argv, meta_options *flag_options, command_flags *flags);
-@@ -631,6 +631,8 @@ parse_args(argv, flag_options, flags)
+@@ -54,7 +54,6 @@ scan_file(fp, filename, flag_options, fl
+ // the first 4 bytes off the stream no matter what.
+
+ char found_valid_header = YES;
+- char found_weak_header = NO;
+
+
+ // Keep all the structures centralized.
+@@ -128,8 +127,6 @@ scan_file(fp, filename, flag_options, fl
+ //
+ if (((header_value >> 21) & 0x7ff) == 0x7ff) {
+
+- found_weak_header = YES;
+-
+ init_frame_struct(&mp3_i);
+
+ if (check_header_value(&header_value, filename, &mp3_i)) {
+@@ -355,13 +352,11 @@ scan_file(fp, filename, flag_options, fl
+
+ // and mark as not currently synchronized - force it
+ found_valid_header = YES;
+- found_weak_header = NO;
+ } else {
+ // Getting to this section does not mean we got
+ // an invalid mp3 file...
+
+ found_valid_header = NO;
+- found_weak_header = NO;
+ }
+ } // WHILE
+
+@@ -631,6 +626,8 @@ parse_args(argv, flag_options, flags)
int error_count = 0;
int found_file = FALSE;
@@ -24,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2011/09/04 04:42:41 dholland Exp $
do {
if (*argv) {
-@@ -670,7 +672,7 @@ parse_args(argv, flag_options, flags)
+@@ -670,7 +667,7 @@ parse_args(argv, flag_options, flags)
return(PASS);
}