apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr-util/test testxml.c
Date Thu, 29 Nov 2001 01:21:37 GMT
trawick     01/11/28 17:21:37

  Modified:    test     testxml.c
  Log:
  get the xml test program to build on systems without
  sys_nerr/sys_errlist (or systems like AIX which have
  them but don't provide declarations)
  
  there is still a bit of errno wonkiness due to the use
  of tmpnam()
  
  Revision  Changes    Path
  1.2       +12 -9     apr-util/test/testxml.c
  
  Index: testxml.c
  ===================================================================
  RCS file: /home/cvs/apr-util/test/testxml.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testxml.c	2001/08/07 23:02:40	1.1
  +++ testxml.c	2001/11/29 01:21:37	1.2
  @@ -90,7 +90,7 @@
               errno = ENOENT;
           }
           perror("tmpnam");
  -        return APR_EGENERAL;
  +        return APR_ENOENT;
       }
       rv = apr_file_open(fd, tmpfile, APR_CREATE|APR_TRUNCATE|APR_DELONCLOSE|
                          APR_READ|APR_WRITE|APR_EXCL, APR_OS_DEFAULT, p);
  @@ -130,7 +130,7 @@
               errno = ENOENT;
           }
           perror("tmpnam");
  -        return APR_EGENERAL;
  +        return APR_ENOENT;
       }
       rv = apr_file_open(fd, tmpfile, APR_CREATE|APR_TRUNCATE|APR_DELONCLOSE|
                          APR_READ|APR_WRITE|APR_EXCL, APR_OS_DEFAULT, p);
  @@ -181,13 +181,16 @@
       }
   }
   
  -static void oops(const char *s1, const char *s2)
  +static void oops(const char *s1, const char *s2, apr_status_t rv)
   {
       if (progname)
           fprintf(stderr, "%s: ", progname);
       fprintf(stderr, s1, s2);
  -    if (errno > 0 && errno < sys_nerr)
  -        fprintf(stderr, " (%s)", sys_errlist[errno]);
  +    if (rv != APR_SUCCESS) {
  +        char buf[120];
  +
  +        fprintf(stderr, " (%s)", apr_strerror(rv, buf, sizeof buf));
  +    }
       fprintf(stderr, "\n");
       exit(1);
   }
  @@ -208,18 +211,18 @@
       if (argc == 1) {
           rv = create_dummy_file(pool, &fd);
           if (rv != APR_SUCCESS) {
  -            oops("cannot create dummy file", "oops");
  +            oops("cannot create dummy file", "oops", rv);
           }
       }
       else {
           if (argc == 2) {
               rv = apr_file_open(&fd, argv[1], APR_READ, APR_OS_DEFAULT, pool);
               if (rv != APR_SUCCESS) {
  -                oops("cannot open: %s", argv[1]);
  +                oops("cannot open: %s", argv[1], rv);
               }
           }
           else {
  -            oops("usage: %s", usage);
  +            oops("usage: %s", usage, 0);
           }
       }
       rv = apr_xml_parse_file(pool, &parser, &doc, fd, 2000);
  @@ -234,7 +237,7 @@
       if (argc == 1) {
           rv = create_dummy_file_error(pool, &fd);
           if (rv != APR_SUCCESS) {
  -            oops("cannot create error dummy file", "oops");
  +            oops("cannot create error dummy file", "oops", rv);
           }
           rv = apr_xml_parse_file(pool, &parser, &doc, fd, 2000);
           if (rv != APR_SUCCESS) {
  
  
  

Mime
View raw message