Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / rights.c

diff --git a/lib/rights.c b/lib/rights.c
index 05a33427f21aca442dcc274491163351bf1cc227..75a3d8e9a2a8385b695f41ae6113faee52527a65 100644 (file)
--- a/lib/rights.c
+++ b/lib/rights.c
@@ -85,7 +85,7 @@ int parse_rights(const char *s, rights_type *rp, int report) {
   if(!*s) {
     /* You can't have no rights */
     if(report)
   if(!*s) {
     /* You can't have no rights */
     if(report)

-      error(0, "empty rights string");
+      disorder_error(0, "empty rights string");

     return -1;
   }
   while(*s) {
     return -1;
   }
   while(*s) {


@@ -102,7 +102,7 @@ int parse_rights(const char *s, rights_type *rp, int report) {
          break;
       if(n >= NRIGHTS) {
        if(report)
          break;
       if(n >= NRIGHTS) {
        if(report)

-          error(0, "unknown user right '%.*s'", (int)l, s);
+          disorder_error(0, "unknown user right '%.*s'", (int)l, s);

        return -1;
       }
       r |= rights_names[n].bit;
        return -1;
       }
       r |= rights_names[n].bit;