From bbbe89166d76a940e686a55fa063ceb95551eddf Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 6 Aug 2009 11:26:38 +0200
Subject: [PATCH] Removed non-API demo programs from Makefile.am and silenced
 compiler warnings of remaining demo programs.

---
 Makefile.am     | 48 +++++++++++++++++++++++++++++-------------------
 demo/iso_read.c |  8 ++++----
 demo/tree.c     |  2 +-
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 430078f..df5127f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,9 @@ libisofs_libisofs_la_SOURCES = \
 	libisofs/iso1999.c \
 	libisofs/data_source.c \
 	libisofs/aaip_0_2.h \
-	libisofs/aaip_0_2.c
+	libisofs/aaip_0_2.c \
+	libisofs/md5.h \
+	libisofs/md5.c
 libisofs_libisofs_la_LIBADD= \
 	$(THREAD_LIBS)
 libinclude_HEADERS = \
@@ -83,32 +85,38 @@ libinclude_HEADERS = \
 
 ## Build demo applications
 noinst_PROGRAMS = \
-	demo/lsl \
-	demo/cat \
-	demo/catbuffer \
 	demo/tree \
 	demo/find \
-	demo/ecma119tree \
 	demo/iso \
 	demo/isoread \
 	demo/isocat \
 	demo/isomodify \
 	demo/isoms
 
+#	demo/ecma119tree \
+#	demo/lsl \
+#	demo/cat \
+#	demo/catbuffer \
 #	demo/isogrow
 
-demo_lsl_CPPFLAGS = -Ilibisofs
-demo_lsl_LDADD = $(libisofs_libisofs_la_OBJECTS) $(libisofs_libisofs_la_LIBADD)
-demo_lsl_SOURCES = demo/lsl.c
+# ts A90806
+# This includes fsource.h and thus is no API demo
+# demo_lsl_CPPFLAGS = -Ilibisofs
+# demo_lsl_LDADD = $(libisofs_libisofs_la_OBJECTS) $(libisofs_libisofs_la_LIBADD)
+# demo_lsl_SOURCES = demo/lsl.c
 
-demo_cat_CPPFLAGS = -Ilibisofs
-demo_cat_LDADD = $(libisofs_libisofs_la_OBJECTS) $(libisofs_libisofs_la_LIBADD)
-demo_cat_SOURCES = demo/cat.c
+# ts A90806
+# This includes fsource.h and thus is no API demo
+# demo_cat_CPPFLAGS = -Ilibisofs
+# demo_cat_LDADD = $(libisofs_libisofs_la_OBJECTS) $(libisofs_libisofs_la_LIBADD)
+# demo_cat_SOURCES = demo/cat.c
 
-demo_catbuffer_CPPFLAGS = -Ilibisofs
-demo_catbuffer_LDADD = $(libisofs_libisofs_la_OBJECTS) \
-	$(libisofs_libisofs_la_LIBADD)
-demo_catbuffer_SOURCES = demo/cat_buffer.c
+# ts A90806
+# This inlcudes buffer.h and thus is no API demo
+# demo_catbuffer_CPPFLAGS = -Ilibisofs
+# demo_catbuffer_LDADD = $(libisofs_libisofs_la_OBJECTS) \
+# 	$(libisofs_libisofs_la_LIBADD)
+# demo_catbuffer_SOURCES = demo/cat_buffer.c
 
 demo_tree_CPPFLAGS = -Ilibisofs
 demo_tree_LDADD = $(libisofs_libisofs_la_OBJECTS) \
@@ -120,10 +128,12 @@ demo_find_LDADD = $(libisofs_libisofs_la_OBJECTS) \
 	$(libisofs_libisofs_la_LIBADD)
 demo_find_SOURCES = demo/find.c
 
-demo_ecma119tree_CPPFLAGS = -Ilibisofs
-demo_ecma119tree_LDADD = $(libisofs_libisofs_la_OBJECTS) \
-	$(libisofs_libisofs_la_LIBADD)
-demo_ecma119tree_SOURCES = demo/ecma119_tree.c
+# ts A90806
+# This inlcudes lots of internal .h files and thus is no API demo
+# demo_ecma119tree_CPPFLAGS = -Ilibisofs
+# demo_ecma119tree_LDADD = $(libisofs_libisofs_la_OBJECTS) \
+# 	$(libisofs_libisofs_la_LIBADD)
+# demo_ecma119tree_SOURCES = demo/ecma119_tree.c
 
 demo_iso_CPPFLAGS = -Ilibisofs
 demo_iso_LDADD = $(libisofs_libisofs_la_OBJECTS) $(libisofs_libisofs_la_LIBADD)
diff --git a/demo/iso_read.c b/demo/iso_read.c
index 63deb49..7b19ba2 100644
--- a/demo/iso_read.c
+++ b/demo/iso_read.c
@@ -15,7 +15,7 @@ print_permissions(mode_t mode)
 {
     char perm[10];
 
-    //TODO suid, sticky...
+    /* TODO suid, sticky... */
 
     perm[9] = '\0';
     perm[8] = mode & S_IXOTH ? 'x' : '-';
@@ -51,8 +51,8 @@ print_file_src(IsoFileSource *file)
     iso_file_source_lstat(file, &info);
     print_type(info.st_mode);
     print_permissions(info.st_mode);
-    printf(" %10llu ", info.st_size);
-    //printf(" {%ld,%ld} ", (long)info.st_dev, (long)info.st_ino);
+    printf(" %10.f ", (double) info.st_size);
+    /* printf(" {%ld,%ld} ", (long)info.st_dev, (long)info.st_ino); */
     name = iso_file_source_get_name(file);
     printf(" %s", name);
     free(name);
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
         printf ("Can't get root %d\n", result);
         return 1;
     }
-    //print_file_src(root);
+    /* print_file_src(root); */
     print_dir(root, 0);
     iso_file_source_unref(root);
 
diff --git a/demo/tree.c b/demo/tree.c
index 6dddbb9..07efdb6 100644
--- a/demo/tree.c
+++ b/demo/tree.c
@@ -15,7 +15,7 @@ print_permissions(mode_t mode)
 {
 	char perm[10];
 	
-	//TODO suid, sticky...
+	/* TODO suid, sticky... */
 	
 	perm[9] = '\0';
 	perm[8] = mode & S_IXOTH ? 'x' : '-';