/*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
{
struct lsatt_action_data *laad = data;
struct osl_object bitnum_obj;
- int ret, ret2;
+ int ret;
if (!(laad->flags & LSATT_FLAG_LONG))
return para_printf(&laad->pb, "%s\n", name);
ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
if (ret < 0) {
- ret2 = para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
+ para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
}
return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
static void com_addatt_callback(int fd, const struct osl_object *query)
{
- char *p = query->data;
+ char *p;
int ret = 1, ret2 = 0;
struct para_buffer pb = {
.max_size = SHMMAX,
struct osl_object objs[NUM_ATT_COLUMNS];
struct osl_row *row;
unsigned char bitnum;
- len = strlen(p);
struct addatt_event_data aed;
+ len = strlen(p);
if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
ret2 = para_printf(&pb, "invalid attribute name: %s\n", p);
if (ret2 < 0)
aed.name = p;
aed.bitnum = bitnum;
afs_event(ATTRIBUTE_ADD, &pb, &aed);
- greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
+ greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum);
}
out:
if (ret < 0 && ret2 >= 0)
- ret = para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
+ para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
if (pb.offset)
pass_buffer_as_shm(pb.buf, pb.offset, &fd);
free(pb.buf);
ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
out:
if (ret < 0)
- ret = para_printf(&pb, "%s\n", para_strerror(-ret));
+ para_printf(&pb, "%s\n", para_strerror(-ret));
else
afs_event(ATTRIBUTE_RENAME, &pb, NULL);
if (pb.offset)
/**
* Open the attribute table.
*
- * \param ti Gets initialized by this function.
- * \param db The database directory.
+ * \param dir The database directory.
*
* \return Positive on success, negative on errors.
*
return osl_create_table(&attribute_table_desc);
}
-
+/**
+ * Initialize the attribute table structure.
+ *
+ * \param t The table structure to initialize.
+ */
void attribute_init(struct afs_table *t)
{
- t->name = attribute_table_desc.name;
t->open = attribute_open;
t->close = attribute_close;
t->create = attribute_create;