Cosmetics.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 5f7188e..e306aa2 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -134,7 +134,7 @@ static int print_attribute(struct osl_table *table, struct osl_row *row,
        }
        ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
        if (ret < 0) {
        }
        ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
        if (ret < 0) {

-               para_printf(&laad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));

                return ret;
        }
        para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
                return ret;
        }
        para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,


@@ -164,7 +164,7 @@ static int com_lsatt_callback(const struct osl_object *query,
                pmd.pm_flags |= PM_REVERSE_LOOP;
        ret = for_each_matching_row(&pmd);
        if (ret < 0)
                pmd.pm_flags |= PM_REVERSE_LOOP;
        ret = for_each_matching_row(&pmd);
        if (ret < 0)

-               para_printf(&laad.pb, "%s\n", PARA_STRERROR(-ret));
+               para_printf(&laad.pb, "%s\n", para_strerror(-ret));

        if (!laad.pb.buf)
                return 0;
        result->data = laad.pb.buf;
        if (!laad.pb.buf)
                return 0;
        result->data = laad.pb.buf;


@@ -200,13 +200,15 @@ int com_lsatt(int fd, int argc, char * const * const argv)
                        continue;
                }
        }
                        continue;
                }
        }

-       ret = send_option_arg_callback_request(&options, argc -i, argv + i,
+       ret = send_option_arg_callback_request(&options, argc - i, argv + i,

                com_lsatt_callback, &result);
        if (ret > 0) {
                ret = send_buffer(fd, (char *)result.data);
                free(result.data);
                com_lsatt_callback, &result);
        if (ret > 0) {
                ret = send_buffer(fd, (char *)result.data);
                free(result.data);

-       } else
-               send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+       } else if (ret < 0)
+               send_va_buffer(fd, "%s\n", para_strerror(-ret));
+       else if (argc > 1)
+               send_va_buffer(fd, "no matches\n");

        return ret;
 }
 
        return ret;
 }
 


@@ -339,7 +341,7 @@ static int com_addatt_callback(const struct osl_object *query,
        }
 out:
        if (ret < 0)
        }
 out:
        if (ret < 0)

-               para_printf(&pb, "%s: %s\n", p, PARA_STRERROR(-ret));
+               para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));

        result->data = pb.buf;
        result->size = pb.size;
        return result->data? 0 : 1;
        result->data = pb.buf;
        result->size = pb.size;
        return result->data? 0 : 1;


@@ -384,7 +386,7 @@ static int com_mvatt_callback(const struct osl_object *query,
        ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
 out:
        if (ret < 0)
        ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
 out:
        if (ret < 0)

-               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.buf)
        else
                afs_event(ATTRIBUTE_RENAME, &pb, NULL);
        if (!pb.buf)


@@ -433,12 +435,12 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 
        ret = get_attribute_bitnum_by_name(name, &red.bitnum);
        if (ret < 0) {
 
        ret = get_attribute_bitnum_by_name(name, &red.bitnum);
        if (ret < 0) {

-               para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));

                return 1;
        }
        ret = osl_del_row(table, row);
        if (ret < 0) {
                return 1;
        }
        ret = osl_del_row(table, row);
        if (ret < 0) {

-               para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+               para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));

                return 1;
        }
        para_printf(&raad->pb, "removed attribute %s\n", name);
                return 1;
        }
        para_printf(&raad->pb, "removed attribute %s\n", name);


@@ -463,7 +465,7 @@ static int com_rmatt_callback(const struct osl_object *query,
        };
        ret = for_each_matching_row(&pmd);
        if (ret < 0)
        };
        ret = for_each_matching_row(&pmd);
        if (ret < 0)

-               para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
+               para_printf(&raad.pb, "%s\n", para_strerror(-ret));

        if (!raad.num_removed)
                para_printf(&raad.pb, "no match -- nothing removed\n");
        result->data = raad.pb.buf;
        if (!raad.num_removed)
                para_printf(&raad.pb, "no match -- nothing removed\n");
        result->data = raad.pb.buf;


@@ -484,7 +486,7 @@ int com_rmatt(int fd, int argc, char * const * const argv)
                send_buffer(fd, (char *)result.data);
                free(result.data);
        } else
                send_buffer(fd, (char *)result.data);
                free(result.data);
        } else

-               send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+               send_va_buffer(fd, "%s\n", para_strerror(-ret));

        return ret;
 }
 
        return ret;
 }