Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XPG3 says that catclose returns an int. 

Changed manpages to note that cat*() functions conform to XPG3.
Changed "private" versions of functions to have only one leading
underscore.
This commit is contained in:
jtc 1994-11-18 15:36:11 +00:00
parent 153d76736d
commit 6dca60107b
7 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc/nls/catclose.3
View File

@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $Id: catclose.3,v 1.1 1994/05/30 00:53:57 jtc Exp $
.\" $Id: catclose.3,v 1.2 1994/11/18 15:36:11 jtc Exp $
.\"
.Dd May 29, 1994
.Dt CATCLOSE 3
@ -36,7 +36,7 @@
.Nd close message catalog
.Sh SYNOPSIS
.Fd #include <nl_types.h>
.Ft void
.Ft int
.Fn catclose "nl_catd catd"
.Sh DESCRIPTION
The
@ -46,3 +46,9 @@ function closes the message catalog specified by the argument
.Sh SEE ALSO
.Xr catopen 3 ,
.Xr catgets 3
.Sh STANDARDS
The
.Fn catclose
function conforms to
.St -xpg3 .

8
lib/libc/nls/catclose.c
View File

@ -6,18 +6,18 @@
#include <sys/cdefs.h>
#ifdef __weak_reference
__weak_reference(__catclose,catclose);
__weak_reference(_catclose,catclose);
#else
#include <nl_types.h>
extern void __catclose __P((nl_catd));
extern int _catclose __P((nl_catd));
void
int
catclose(catd)
nl_catd catd;
{
__catclose(catd);
return _catclose(catd);
}
#endif

7
lib/libc/nls/catgets.3
View File

@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $Id: catgets.3,v 1.2 1994/10/05 17:31:50 jtc Exp $
.\" $Id: catgets.3,v 1.3 1994/11/18 15:36:14 jtc Exp $
.\"
.Dd May 29, 1994
.Dt CATGETS 3
@ -60,3 +60,8 @@ otherwise it returns
.Sh SEE ALSO
.Xr catclose 3 ,
.Xr catopen 3
.Sh STANDARDS
The
.Fn catgets
function conforms to
.St -xpg3 .

6
lib/libc/nls/catgets.c
View File

@ -6,12 +6,12 @@
#include <sys/cdefs.h>
#ifdef __weak_reference
__weak_reference(__catgets,catgets);
__weak_reference(_catgets,catgets);
#else
#include <nl_types.h>
extern char * __catgets __P((nl_catd, int, int, char *));
extern char * _catgets __P((nl_catd, int, int, char *));
char *
catgets(catd, set_id, msg_id, s)
@ -20,7 +20,7 @@ catgets(catd, set_id, msg_id, s)
int msg_id;
char *s;
{
return __catgets(catd, set_id, msg_id, s);
return _catgets(catd, set_id, msg_id, s);
}
#endif

7
lib/libc/nls/catopen.3
View File

@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $Id: catopen.3,v 1.1 1994/05/30 03:40:40 jtc Exp $
.\" $Id: catopen.3,v 1.2 1994/11/18 15:36:16 jtc Exp $
.\"
.Dd May 29, 1994
.Dt CATOPEN 3
@ -75,3 +75,8 @@ Insufficient memory is availiable.
.Sh SEE ALSO
.Xr catclose 3 ,
.Xr catgets 3
.Sh STANDARDS
The
.Fn catopen
function conforms to
.St -xpg3 .

6
lib/libc/nls/catopen.c
View File

@ -6,19 +6,19 @@
#include <sys/cdefs.h>
#ifdef __weak_reference
__weak_reference(__catopen,catopen);
__weak_reference(_catopen,catopen);
#else
#include <nl_types.h>
extern nl_catd __catopen __P((char *, int));
extern nl_catd _catopen __P((char *, int));
nl_catd
catopen(name, oflag)
char *name;
int oflag;
{
return __catopen(name, oflag);
return _catopen(name, oflag);
}
#endif

12
lib/libc/nls/msgcat.c
View File

@ -31,7 +31,7 @@ up-to-date. Many thanks.
******************************************************************/
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$Id: msgcat.c,v 1.6 1994/10/06 05:41:45 jtc Exp $";
static char *rcsid = "$Id: msgcat.c,v 1.7 1994/11/18 15:36:19 jtc Exp $";
#endif /* LIBC_SCCS and not lint */
/* Edit History
@ -79,7 +79,7 @@ static char *rcsid = "$Id: msgcat.c,v 1.6 1994/10/06 05:41:45 jtc Exp $";
static nl_catd loadCat();
static nl_catd loadSet();
nl_catd __catopen( name, type)
nl_catd _catopen( name, type)
char *name;
int type;
{
@ -235,7 +235,7 @@ int msgId;
return(msg);
}
char *__catgets( catd, setId, msgId, dflt)
char *_catgets( catd, setId, msgId, dflt)
nl_catd catd;
int setId;
int msgId;
@ -252,7 +252,7 @@ char *dflt;
}
void __catclose( catd)
int _catclose( catd)
nl_catd catd;
{
MCCatT *cat = (MCCatT *) catd;
@ -260,7 +260,7 @@ nl_catd catd;
MCMsgT *msg;
int i, j;
if (!cat) return;
if (!cat) return -1;
if (cat->loadType != MCLoadAll) close(cat->fd);
for (i = 0; i < cat->numSets; ++i) {
@ -272,6 +272,8 @@ nl_catd catd;
}
free(cat->sets);
free(cat);
return 0;
}
/*