Merge branch 'refs/heads/t/lopsub'

* refs/heads/t/lopsub:
  Convert oslfsck to lopsub.

The merge conflicted twice for the Makefile because of commit
ec08b17c7514 which touched the object list of oslfsck and added
-DVERSION to the CPPFLAGs. This was easy to fix, though.

diff --git a/Makefile b/Makefile
index a4f5fadb1631f47c0b8a131e28553ed476186aa0..7ce449390d1eb9ef7bac35857984c4d45722aaa8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ bindir := $(PREFIX)/bin
 mandir := $(PREFIX)/man/man1
 
 objects := osl.o util.o rbtree.o sha1.o
-fsck_objects := fsck.fsck.o osl.fsck.o util.fsck.o rbtree.fsck.o sha1.fsck.o oslfsck.lsg.o
+fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o oslfsck.lsg.o
 headers := osl.h
 executables := oslfsck
 man_pages := oslfsck.1
@@ -29,6 +29,8 @@ z := 3
 VERSION := $(x).$(y).$(z)
 
 # common flags
+CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
+
 CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 CFLAGS += -Wredundant-decls
 CFLAGS += -Os
@@ -119,9 +121,6 @@ osl.c fsck.c:
 
 -include Makefile.deps
 
-%.fsck.o: %.c Makefile osl.h errtab.h oslfsck.lsg.h
-       $(CC) -c -DOSL_VERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
-
 %.o: %.c Makefile errtab.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
 

diff --git a/osl.h.in b/osl.h.in
index 17bfbc16656abf7b6ac0a928378cc7529dbb00cf..2abe135d7967446643aa6a803656aaa85b754d14 100644 (file)
--- a/osl.h.in
+++ b/osl.h.in
@@ -124,6 +124,11 @@ struct osl_column_description {
 
 /**
  * Describes one osl table.
+ *
+ * A pointer to the table description is passed to \ref osl_create_table() and
+ * \ref osl_open_table(). The osl library calls which operate on an open table
+ * refer to the fields of the table description through this pointer. Hence the
+ * table description must not be modified or freed before the table is closed.
  */
 struct osl_table_description {
        /**

diff --git a/web/index.html.in b/web/index.html.in
index eed742ae9980668515e8063886ea0cf1f8d3bad3..359772f0e4fb0880d511cd45e6f7fb089c24cb92 100644 (file)
--- a/web/index.html.in
+++ b/web/index.html.in
@@ -106,9 +106,14 @@
                </h2>
        </center>
 
-       <p> Andre Noll, <a
-       href="mailto:maan@tuebingen.mpg.de?subject=[osl]: ">maan@tuebingen.mpg.de</a>
-       </p> Comments and bug reports are welcome. Please provide
+       <p> Email: Andr&eacute; Noll, <a
+       href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>,
+       Homepage: <a
+       href="http://people.tuebingen.mpg.de/maan/">http://people.tuebingen.mpg.de/maan/</a>
+       </p>
+
+
+       Comments and bug reports are welcome. Please provide
        enough info such as the version of osl you are using and
        relevant parts of the logs. Including the string [osl] in
        the subject line is also a good idea.