Don't mention MacOS and Solaris in README and INSTALL.

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index c6959acc0780144715f5a201c599380fcb9f4108..e31811b9c57eb0d897aee1c92c41b72cb35a97cc 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -13,7 +13,14 @@
 #include "util.h"
 #include "osl_core.h"
 
-/* Taken from Drepper: How to write shared libraries, Appendix B. */
+/*
+ * Taken from Drepper: How to write shared libraries, Appendix B.
+ *
+ * The main reason for this rather fancy implementation of strerror() is to
+ * avoid having an array of pointers. This is desirable because initialized
+ * pointer variables increase the startup time of the library due to the
+ * processing of relocations.
+ */
 #include <stddef.h>
 #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
 #define MSGSTRFIELD1(line) str##line
@@ -1572,7 +1579,8 @@ __export int osl_update_object(struct osl_table *t, const struct osl_row *r,
        }
        remove_rb_node(t, col_num, r);
        if (cd->storage_type == OSL_NO_STORAGE) { /* TODO: If fixed size, reuse object? */
-               free(r->volatile_objects[col->volatile_num].data);
+               if (!(cd->storage_flags & OSL_DONT_FREE))
+                       free(r->volatile_objects[col->volatile_num].data);
                r->volatile_objects[col->volatile_num] = *obj;
        } else if (cd->storage_type == OSL_DISK_STORAGE) {
                char *ds_name;
@@ -1701,6 +1709,7 @@ __export int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
        unsigned num_rows;
        int ret;
 
+       *result = NULL;
        if (n == 0)
                return -E_OSL_RB_KEY_NOT_FOUND;
        ret = osl_get_num_rows(t, &num_rows);