First draft of the libosl patch series.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 30c12f1ca133a0caa98ac581ca1fc31aaf5c4909..ec2eae73ab9c59297bd0d0df14062579ff06e26b 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -317,7 +317,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
                                goto out;
                        continue;
                }
                                goto out;
                        continue;
                }

-               if (ret != -E_RB_KEY_NOT_FOUND) /* error */
+               if (ret != -E_OSL_RB_KEY_NOT_FOUND) /* error */

                        goto out;
                objs[ATTCOL_BITNUM].size = 1;
                /* find smallest unused attribute */
                        goto out;
                objs[ATTCOL_BITNUM].size = 1;
                /* find smallest unused attribute */


@@ -325,7 +325,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
                        objs[ATTCOL_BITNUM].data = &bitnum;
                        ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
                                &objs[ATTCOL_BITNUM], &row);
                        objs[ATTCOL_BITNUM].data = &bitnum;
                        ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
                                &objs[ATTCOL_BITNUM], &row);

-                       if (ret == -E_RB_KEY_NOT_FOUND)
+                       if (ret == -E_OSL_RB_KEY_NOT_FOUND)

                                break; /* this bitnum is unused, use it */
                        if (ret < 0) /* error */
                                goto out;
                                break; /* this bitnum is unused, use it */
                        if (ret < 0) /* error */
                                goto out;