cvs commit: apachen/src/modules/standard mod_negotiation.c

[Randy Terbush]

randy       97/08/31 19:32:56

  Modified:    src/modules/standard mod_negotiation.c
  Log:
  Convert log_*() to aplog_error().
  
  Revision  Changes    Path
  1.56      +13 -7     apachen/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- mod_negotiation.c 1997/08/23 14:20:35     1.55
  +++ mod_negotiation.c 1997/09/01 02:32:54     1.56
  @@ -629,15 +629,17 @@
           *cp++ = tolower(*cp);
       
       if (!*cp) {
  -     log_reason ("Syntax error in type map --- no ':'", r->filename, r);
  +     aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                 "Syntax error in type map --- no ':': %s", r->filename);
        return NULL;
       }
   
       do ++cp; while (*cp && isspace (*cp));
   
       if (!*cp) {
  -     log_reason ("Syntax error in type map --- no header body",
  -                 r->filename, r);
  +     aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                 "Syntax error in type map --- no header body: %s",
  +                 r->filename);
        return NULL;
       }
   
  @@ -660,7 +662,8 @@
       }
       map = pfopen (neg->pool, rr->filename, "r");
       if (map == NULL) {
  -        log_reason("cannot access type map file", rr->filename, r);
  +        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                 "cannot access type map file", rr->filename);
        return FORBIDDEN;
       }
   
  @@ -745,7 +748,8 @@
       dirp = popendir (neg->pool, neg->dir_name);
   
       if (dirp == NULL) {
  -        log_reason("cannot read directory for multi", neg->dir_name, r);
  +        aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +                 "cannot read directory for multi", neg->dir_name);
        return FORBIDDEN;
       }
   
  @@ -1887,7 +1891,8 @@
       }
   
       if (!best) {
  -      log_reason ("no acceptable variant", r->filename, r);
  +      aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +               "no acceptable variant", r->filename);
   
         set_neg_headers(r, neg, na_result);
         store_variant_list (r, neg);
  @@ -1966,7 +1971,8 @@
       }
   
       if (!best) {
  -      log_reason ("no acceptable variant", r->filename, r);
  +      aplog_error(APLOG_MARK, APLOG_ERR, r->server,
  +               "no acceptable variant", r->filename);
   
         set_neg_headers (r, neg, na_result);
         store_variant_list (r, neg);