[GNUnet-SVN] r2488 - in Extractor/src: include main plugins

[grothoff]

Author: grothoff
Date: 2006-03-11 20:38:37 -0800 (Sat, 11 Mar 2006)
New Revision: 2488

Modified:
   Extractor/src/include/extractor.h
   Extractor/src/main/extractor.c
   Extractor/src/plugins/lowerextractor.c
Log:
lowercase

Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h   2006-03-11 23:40:48 UTC (rev 2487)
+++ Extractor/src/include/extractor.h   2006-03-12 04:38:37 UTC (rev 2488)
@@ -151,6 +151,7 @@
   EXTRACTOR_CREATED_BY_SOFTWARE = 98,
   EXTRACTOR_MODIFIED_BY_SOFTWARE = 99,
   EXTRACTOR_REVISION_HISTORY = 100,
+  EXTRACTOR_LOWERCASE = 101,
 } EXTRACTOR_KeywordType;
 
 /**

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2006-03-11 23:40:48 UTC (rev 2487)
+++ Extractor/src/main/extractor.c      2006-03-12 04:38:37 UTC (rev 2488)
@@ -142,11 +142,12 @@
   gettext_noop("created by software"),
   gettext_noop("modified by software"),
   gettext_noop("revision history"),
+  gettext_noop("lower case conversion"),
   NULL,
 };
 
 /* the number of keyword types (for bounds-checking) */
-#define HIGHEST_TYPE_NUMBER 101
+#define HIGHEST_TYPE_NUMBER 102
 
 #ifdef HAVE_LIBOGG
 #if HAVE_VORBIS

Modified: Extractor/src/plugins/lowerextractor.c
===================================================================
--- Extractor/src/plugins/lowerextractor.c      2006-03-11 23:40:48 UTC (rev 
2487)
+++ Extractor/src/plugins/lowerextractor.c      2006-03-12 04:38:37 UTC (rev 
2488)
@@ -22,8 +22,8 @@
 #include "extractor.h"
 
 static void addKeyword(struct EXTRACTOR_Keywords ** list,
-                      char * keyword,
-              EXTRACTOR_KeywordType type) {
+                      const char * keyword,
+                      EXTRACTOR_KeywordType type) {
   EXTRACTOR_KeywordList * next;
   next = malloc(sizeof(EXTRACTOR_KeywordList));
   next->next = *list;
@@ -33,10 +33,11 @@
 }
 
 /* convert other keywords to lower case */
-struct EXTRACTOR_Keywords * libextractor_lower_extract(char * filename,
-                                                      char * data,
-                                                      size_t size,
-                                                      struct 
EXTRACTOR_Keywords * prev) {
+struct EXTRACTOR_Keywords * 
+libextractor_lower_extract(char * filename,
+                          char * data,
+                          size_t size,
+                          struct EXTRACTOR_Keywords * prev) {
   struct EXTRACTOR_Keywords * pos;
   char *lower;
   unsigned int mem, needed, i;
@@ -61,7 +62,7 @@
 
     if(strcmp(pos->keyword, lower))
     {
-     addKeyword(&prev, lower, EXTRACTOR_UNKNOWN);
+     addKeyword(&prev, lower, EXTRACTOR_LOWERCASE);
     }
     pos = pos->next;
   }