[xiph-commits] r3316 - in liboggz/trunk: doc src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2007-12-16 22:28:08 -0800 (Sun, 16 Dec 2007)
New Revision: 3316

Modified:
   liboggz/trunk/doc/oggz-comment.1.sgml
   liboggz/trunk/src/tools/oggz-comment.c
Log:
use -c, --content-type to select on content-type in oggz-comment, and rename
--clear to --delete (+update help text and man page accordingly)


Modified: liboggz/trunk/doc/oggz-comment.1.sgml
===================================================================
--- liboggz/trunk/doc/oggz-comment.1.sgml	2007-12-16 12:10:49 UTC (rev 3315)
+++ liboggz/trunk/doc/oggz-comment.1.sgml	2007-12-17 06:28:08 UTC (rev 3316)
@@ -73,7 +73,7 @@
 	<arg choice="opt">--output <parameter>filename</parameter></arg>
       </group>
 
-      <group><arg choice="opt">-c</arg><arg choice="opt">--clear</arg></group>
+      <group><arg choice="opt">-d</arg><arg choice="opt">--delete</arg></group>
 
       <group><arg choice="opt">-a</arg><arg choice="opt">--all</arg></group>
       <group>
@@ -82,8 +82,8 @@
       </group>
 
       <group>
-	<arg choice="opt">-t <parameter>content-type</parameter></arg>
-	<arg choice="opt">--type <parameter>content-type</parameter></arg>
+	<arg choice="opt">-c <parameter>content-type</parameter></arg>
+	<arg choice="opt">--content-type <parameter>content-type</parameter></arg>
       </group>
 
       <arg choice="plain">filename</arg>
@@ -131,8 +131,8 @@
 	    </para></listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term>-c, --clear</term>
-	  <listitem><para>Clear comments before editing.</para></listitem>
+	  <term>-d, --delete</term>
+	  <listitem><para>Delete comments before editing.</para></listitem>
 	</varlistentry>
       </variablelist>
 	<varlistentry>
@@ -141,7 +141,7 @@
 	</varlistentry>
       </variablelist>
         <varlistentry>
-          <term>-t <parameter>content-type</parameter>, --type <parameter>content-type</parameter></term>
+          <term>-c <parameter>content-type</parameter>, --content-type <parameter>content-type</parameter></term>
           <listitem><para>Edit comments of the logical bitstreams with
                specified <parameter>content-type</parameter>.</para></listitem>
         </varlistentry>

Modified: liboggz/trunk/src/tools/oggz-comment.c
===================================================================
--- liboggz/trunk/src/tools/oggz-comment.c	2007-12-16 12:10:49 UTC (rev 3315)
+++ liboggz/trunk/src/tools/oggz-comment.c	2007-12-17 06:28:08 UTC (rev 3316)
@@ -56,9 +56,9 @@
   printf ("\nEditing options\n");
   printf ("  -o filename, --output filename\n");
   printf ("                         Specify output filename\n");
-  printf ("  -c, --clear            Clear comments before editing\n");
+  printf ("  -d, --delete           Delete comments before editing\n");
   printf ("  -a, --all              Edit comments for all logical bitstreams\n");
-  printf ("  -t content-type, --type content-type\n");
+  printf ("  -c content-type, --content-type content-type\n");
   printf ("                         Edit comments of the logical bitstreams with\n");
   printf ("                         specified content-type\n");
   printf ("  -s serialno, --serialno serialno\n");
@@ -253,8 +253,8 @@
   for(i = 2; i < argc; i++) {
     if(!strcmp(argv[i], "-o"))
       out_file = argv[++i];
-    else if(!strcmp(argv[i], "-c")
-           || !strcmp(argv[i], "--clear"))
+    else if(!strcmp(argv[i], "-d")
+           || !strcmp(argv[i], "--delete"))
       clear = 1;
     else if(!strcmp(argv[i], "-l")
            || !strcmp(argv[i], "--list")) {
@@ -270,8 +270,8 @@
        comments[temp = 0].name = "0";
       }
       serialno = -11;
-    } else if(!strcmp(argv[i], "-t")
-           || !strcmp(argv[i], "--type")) {
+    } else if(!strcmp(argv[i], "-c")
+           || !strcmp(argv[i], "--content-type")) {
       if(comment_table_insert(type_table, comment_table, serialno, comments)) {
        comments = calloc(argc - 2, sizeof(OggzComment));
        comments[temp = 0].name = "0";