You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jf...@apache.org on 2001/05/22 09:40:31 UTC
cvs commit: apr-iconv/lib iconv_module.c
jfclere 01/05/22 00:40:31
Modified: lib iconv_module.c
Log:
Change EFTYPE into APR_ICONV_EFTYPE (EFTYPE is used by FreeBSD).
Revision Changes Path
1.5 +2 -1 apr-iconv/lib/iconv_module.c
Index: iconv_module.c
===================================================================
RCS file: /home/cvs/apr-iconv/lib/iconv_module.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iconv_module.c 2001/04/24 10:46:37 1.4
+++ iconv_module.c 2001/05/22 07:40:29 1.5
@@ -29,6 +29,7 @@
*/
#define ICONV_INTERNAL
+
#include "iconv.h"
#include "apr_file_io.h"
#include "apr_pools.h"
@@ -119,7 +120,7 @@
return error;
if (modtype != ICMOD_ANY && mdesc->imd_type != modtype) {
apr_dso_unload(handle);
- return EFTYPE;
+ return APR_ICONV_EFTYPE;
}
mod = malloc(sizeof(*mod));
if (mod == NULL) {
Re: cvs commit: apr-iconv/lib iconv_module.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
From: "jean-frederic clere" <jf...@fujitsu-siemens.com>
To: "William A. Rowe, Jr." <wr...@rowe-clan.net>; "apr" <de...@apr.apache.org>
Sent: Tuesday, May 22, 2001 5:57 AM
Subject: Re: cvs commit: apr-iconv/lib iconv_module.c
> "William A. Rowe, Jr." wrote:
> >
> > See apr/include/apr_errno.h for the appropriate templates, just follow right
> > along :-) EFTYPE would be appropriate all over, say if a loaded module doesn't
> > have the appropriate entry point or data export to be an apache module, etc.
>
> Ok, I will add APR_EFTYPE to APR. and arrange apr_iconv
>
> The patch for apr/include/apr_errno.h could be the one proposed in attachement.
> Please check it.
Yup, with the caviat that you need to catch win32 and os2 (just that one value)
for the APR_STATUS_IS tests... but it looks great.
Bill
Re: cvs commit: apr-iconv/lib iconv_module.c
Posted by jean-frederic clere <jf...@fujitsu-siemens.com>.
"William A. Rowe, Jr." wrote:
>
> See apr/include/apr_errno.h for the appropriate templates, just follow right
> along :-) EFTYPE would be appropriate all over, say if a loaded module doesn't
> have the appropriate entry point or data export to be an apache module, etc.
Ok, I will add APR_EFTYPE to APR. and arrange apr_iconv
The patch for apr/include/apr_errno.h could be the one proposed in attachement.
Please check it.
>
> Bill
>
> ----- Original Message -----
> From: "jean-frederic clere" <jf...@fujitsu-siemens.com>
> To: "William A. Rowe, Jr." <wr...@rowe-clan.net>
> Cc: <de...@apr.apache.org>
> Sent: Tuesday, May 22, 2001 4:18 AM
> Subject: Re: cvs commit: apr-iconv/lib iconv_module.c
>
> > "William A. Rowe, Jr." wrote:
> > >
> > > > jfclere 01/05/22 00:40:31
> > > >
> > > > Modified: lib iconv_module.c
> > > > Log:
> > > > Change EFTYPE into APR_ICONV_EFTYPE (EFTYPE is used by FreeBSD).
> > > >
> > > > - return EFTYPE;
> > > > + return APR_ICONV_EFTYPE;
> > >
> > > Guys, in case we missed the point from the earlier conversion, we have to
> > > quit inventing 'custom specific error codes' when plain old obvious codes
> > > can be assigned!!! If that means APR_EFTYPE, then fine, but please, lets
> > > not get too specific!
> >
> > Apr-iconv logic was using EFTYPE to tell that the converter needs another
> > converter.
> > In FreeBSD I have found:
> > #define EFTYPE 79 /* Inappropriate file type or format */
> >
> > What should I do? Add APR_EFTYPE to APR, but the modules that uses it is an
> > internal module of apr-iconv.
> >
> > >
> > > Bill
> >
Re: cvs commit: apr-iconv/lib iconv_module.c
Posted by jean-frederic clere <jf...@fujitsu-siemens.com>.
"William A. Rowe, Jr." wrote:
>
> > jfclere 01/05/22 00:40:31
> >
> > Modified: lib iconv_module.c
> > Log:
> > Change EFTYPE into APR_ICONV_EFTYPE (EFTYPE is used by FreeBSD).
> >
> > - return EFTYPE;
> > + return APR_ICONV_EFTYPE;
>
> Guys, in case we missed the point from the earlier conversion, we have to
> quit inventing 'custom specific error codes' when plain old obvious codes
> can be assigned!!! If that means APR_EFTYPE, then fine, but please, lets
> not get too specific!
Apr-iconv logic was using EFTYPE to tell that the converter needs another
converter.
In FreeBSD I have found:
#define EFTYPE 79 /* Inappropriate file type or format */
What should I do? Add APR_EFTYPE to APR, but the modules that uses it is an
internal module of apr-iconv.
>
> Bill
Re: cvs commit: apr-iconv/lib iconv_module.c
Posted by "William A. Rowe, Jr." <ad...@rowe-clan.net>.
> jfclere 01/05/22 00:40:31
>
> Modified: lib iconv_module.c
> Log:
> Change EFTYPE into APR_ICONV_EFTYPE (EFTYPE is used by FreeBSD).
>
> - return EFTYPE;
> + return APR_ICONV_EFTYPE;
Guys, in case we missed the point from the earlier conversion, we have to
quit inventing 'custom specific error codes' when plain old obvious codes
can be assigned!!! If that means APR_EFTYPE, then fine, but please, lets
not get too specific!
Bill