aboutsummaryrefslogtreecommitdiff
path: root/catgets/catgetsinfo.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-08 21:25:01 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-08 21:25:01 +0000
commitca130fe4651a2ca547b05187bdc2804defc8a66b (patch)
tree9e743e6df3161a03fda43de4ff71f3b52f21c4fa /catgets/catgetsinfo.h
parent443470c3360d5d4ffb8f3078f47cda55fd5cffbd (diff)
downloadglibc-ca130fe4651a2ca547b05187bdc2804defc8a66b.tar
glibc-ca130fe4651a2ca547b05187bdc2804defc8a66b.tar.gz
glibc-ca130fe4651a2ca547b05187bdc2804defc8a66b.tar.bz2
glibc-ca130fe4651a2ca547b05187bdc2804defc8a66b.zip
Update.
* catgets/open_catalog.c: Rewrite code to assume that the function is called at catopen time and not delayed in catgets. * catgets/catgets.c (catopen): Call __open_catalog and fail if that function failed. (catgets): Remove code for delayed opening of catalog. * catgets/catgetsinfo.h: Remove now unnecessary information from struct catalog_info. Change __open_catalog prototype. * catgets/gencat.c: Adjust __open_catalog call. * catgets/test-gencat.c: Stop program if catopen failed.
Diffstat (limited to 'catgets/catgetsinfo.h')
-rw-r--r--catgets/catgetsinfo.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/catgets/catgetsinfo.h b/catgets/catgetsinfo.h
index d40b4193f3..d4aa003b34 100644
--- a/catgets/catgetsinfo.h
+++ b/catgets/catgetsinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
@@ -18,7 +18,6 @@
02111-1307 USA. */
#include <sys/types.h>
-#include <bits/libc-lock.h>
struct catalog_obj
@@ -35,11 +34,7 @@ struct catalog_obj
/* This structure will be filled after loading the catalog. */
typedef struct catalog_info
{
- enum { closed, nonexisting, mmapped, malloced } status;
-
- const char *cat_name;
- const char *env_var;
- const char *nlspath;
+ enum { mmapped, malloced } status;
size_t plane_size;
size_t plane_depth;
@@ -48,8 +43,6 @@ typedef struct catalog_info
struct catalog_obj *file_ptr;
size_t file_size;
-
- __libc_lock_define (,lock);
} *__nl_catd;
@@ -59,4 +52,5 @@ typedef struct catalog_info
/* Prototypes for helper functions. */
-void __open_catalog (__nl_catd __catalog);
+extern int __open_catalog (const char *cat_name, const char *nlspath,
+ const char *env_var, __nl_catd __catalog);