Rename g_mime_test to notmuch-index-message

In preparation for actually creating a Xapian index from the
message, (not that we're doing that quite yet).

diff --git a/.gitignore b/.gitignore
index de876006c6e8995f8fa0d38db883824559956432..d74db384fcc04fdd28e4a81c1325d652c2a511bb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xapian-dump
-g_mime_test
+notmuch-index-message
+

diff --git a/Makefile b/Makefile
index 614c57600917cc6e25559ee7147962f8e6460a37..bf3a5200ff74b99e47c94e0b674c762c3294b2e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
-PROGS=g_mime_test xapian-dump
+PROGS=notmuch-index-message xapian-dump
 
-MYCFLAGS=-Wall
 MYCXXFLAGS=-Wall
 
 all: $(PROGS)
 
-g_mime_test: g_mime_test.c
-       $(CC) $(CFLAGS) $(MYCFLAGS) g_mime_test.c `pkg-config --cflags --libs gmime-2.4` -o g_mime_test
+notmuch-index-message: notmuch-index-message.cc
+       $(CC) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
 
 xapian-dump: xapian-dump.cc
        $(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump

diff --git a/g_mime_test.c b/notmuch-index-message.cc
similarity index 99%
rename from g_mime_test.c
rename to notmuch-index-message.cc
index 5ac9200c6335bef4af94837c14b645838973070c..cf99e6e43d7762e25fa812f307ab3cf65d452827 100644 (file)
--- a/g_mime_test.c
+++ b/notmuch-index-message.cc
@@ -64,7 +64,7 @@ prefix_t BOOLEAN_PREFIX[] = {
 static const char *
 find_prefix (const char *name)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < ARRAY_SIZE (NORMAL_PREFIX); i++)
        if (strcmp (name, NORMAL_PREFIX[i].name) == 0)
@@ -175,9 +175,9 @@ main (int argc, char **argv)
        fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
        exit (1);
     }
-    
+
     g_mime_init (0);
-    
+
     stream = g_mime_stream_file_new (file);
 
     parser = g_mime_parser_new_with_stream (stream);
@@ -238,6 +238,6 @@ main (int argc, char **argv)
     g_object_unref (message);
     g_object_unref (parser);
     g_object_unref (stream);
-    
+
     return 0;
 }