build: Fix dependencies for oslfsck.

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index 90601dc287e3b8ec3de7baf7b9d1c6f2862e1c72..e31811b9c57eb0d897aee1c92c41b72cb35a97cc 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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
@@ -61,20 +68,18 @@ static void __attribute ((constructor)) init_loglevel(void)
 __printf_2_3 void __log(int ll, const char* fmt,...)
 {
        va_list argp;
-       FILE *outfd;
        struct tm *tm;
        time_t t1;
        char str[255] = "";
 
        if (ll < loglevel)
                return;
-       outfd = stderr;
        time(&t1);
        tm = localtime(&t1);
        strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
-       fprintf(outfd, "%s ", str);
+       fprintf(stderr, "%s ", str);
        va_start(argp, fmt);
-       vfprintf(outfd, fmt, argp);
+       vfprintf(stderr, fmt, argp);
        va_end(argp);
 }
 
@@ -279,6 +284,9 @@ int init_table_structure(const struct osl_table_description *desc,
                ret = -E_OSL_BAD_STORAGE_FLAGS;
                if (st == OSL_DISK_STORAGE && sf & OSL_RBTREE)
                        goto err;
+               if ((sf & OSL_RBTREE) && !(sf & OSL_UNIQUE))
+                       WARNING_LOG("invalid storage flags for column %s: "
+                               "OSL_RBTREE && !OSL_UNIQUE\n", cd->name);
                ret = -E_OSL_BAD_STORAGE_SIZE;
                if (sf & OSL_FIXED_SIZE && !cd->data_size)
                        goto err;
@@ -518,7 +526,7 @@ static int create_table_index(struct osl_table *t)
                strcpy(buf + offset + IDX_CD_NAME, cd->name);
                offset += index_column_description_size(cd->name);
        }
-       assert(offset = size);
+       assert(offset == size);
        filename = index_filename(t->desc);
        if (filename)
                ret = write_file(filename, buf, size);
@@ -1047,6 +1055,7 @@ int init_rbtrees(struct osl_table *t)
        /* add valid rows to rbtrees */
        t->num_invalid_rows = 0;
        for (i = 0; i < t->num_rows; i++) {
+               struct osl_object *volatile_objs;
                ret = row_is_invalid(t, i);
                if (ret < 0)
                        return ret;
@@ -1054,7 +1063,14 @@ int init_rbtrees(struct osl_table *t)
                        t->num_invalid_rows++;
                        continue;
                }
-               ret = add_row_to_rbtrees(t, i, NULL, NULL);
+               if (t->num_volatile_columns > 0) {
+                       volatile_objs = calloc(t->num_volatile_columns,
+                               sizeof(struct osl_object));
+                       if (!volatile_objs)
+                               return -E_OSL_NOMEM;
+               } else
+                       volatile_objs = NULL;
+               ret = add_row_to_rbtrees(t, i, volatile_objs, NULL);
                if (ret < 0)
                        return ret;
        }
@@ -1563,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;
@@ -1692,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);