[xiph-commits] r14563 - trunk/vorbis-tools/oggenc

[msmith at svn.xiph.org]

Author: msmith
Date: 2008-03-10 01:20:00 -0700 (Mon, 10 Mar 2008)
New Revision: 14563

Modified:
   trunk/vorbis-tools/oggenc/oggenc.c
Log:
Revert r14562. Whilst comparing pointers for string equality is indeed a bad
idea, this code was not trying to compare string equality.


Modified: trunk/vorbis-tools/oggenc/oggenc.c
===================================================================
--- trunk/vorbis-tools/oggenc/oggenc.c	2008-03-09 22:31:47 UTC (rev 14562)
+++ trunk/vorbis-tools/oggenc/oggenc.c	2008-03-10 08:20:00 UTC (rev 14563)
@@ -771,8 +771,8 @@
                 opt->namefmt = strdup(optarg);
                 break;
             case 'X':
-                if(opt->namefmt_remove && strcmp(opt->namefmt_remove,
-                       DEFAULT_NAMEFMT_REMOVE))
+                if(opt->namefmt_remove && opt->namefmt_remove != 
+                        DEFAULT_NAMEFMT_REMOVE)
                 {
                     fprintf(stderr, _("WARNING: Multiple name format filters specified, using final\n"));
                     free(opt->namefmt_remove);
@@ -947,7 +947,7 @@
         else
             i = filenum;
 
-        *album = opt->album[i];
+        *album = opt->album[i];    
         add_tag(vc, opt, "album", opt->album[i]);
     }