diff options
Diffstat (limited to 'catgets')
| -rw-r--r-- | catgets/catgets.c | 2 | ||||
| -rw-r--r-- | catgets/catgetsinfo.h | 30 | ||||
| -rw-r--r-- | catgets/gencat.c | 4 | ||||
| -rw-r--r-- | catgets/open_catalog.c | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/catgets/catgets.c b/catgets/catgets.c index ab7d28a682..b8e5bf0750 100644 --- a/catgets/catgets.c +++ b/catgets/catgets.c @@ -154,7 +154,7 @@ catclose (nl_catd catalog_desc) catalog = (__nl_catd) catalog_desc; - if (catalog->status == mmaped) + if (catalog->status == mmapped) munmap ((void *) catalog->file_ptr, catalog->file_size); else if (catalog->status == malloced) free ((void *) catalog->file_ptr); diff --git a/catgets/catgetsinfo.h b/catgets/catgetsinfo.h index 7e0a26f798..292572decf 100644 --- a/catgets/catgetsinfo.h +++ b/catgets/catgetsinfo.h @@ -1,21 +1,21 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <sys/types.h> @@ -34,7 +34,7 @@ struct catalog_obj /* This structure will be filled after loading the catalog. */ typedef struct catalog_info { - enum { closed, nonexisting, mmaped, malloced } status; + enum { closed, nonexisting, mmapped, malloced } status; const char *cat_name; const char *env_var; diff --git a/catgets/gencat.c b/catgets/gencat.c index 9e7404295e..561b0e5230 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -353,7 +353,7 @@ read_input_file (struct catalog *current, const char *fname) } else { - /* We have found seomthing which looks like a + /* We have found seomthing that looks like a correct identifier. */ struct set_list *runp; @@ -980,7 +980,7 @@ read_old (struct catalog *catalog, const char *file_name) /* Try to open catalog, but don't look through the NLSPATH. */ __open_catalog (&old_cat_obj, 0); - if (old_cat_obj.status != mmaped && old_cat_obj.status != malloced) + if (old_cat_obj.status != mmapped && old_cat_obj.status != malloced) if (errno == ENOENT) /* No problem, the catalog simply does not exist. */ return; diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index 5335b433c7..80d2899a36 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -185,7 +185,7 @@ __open_catalog (__nl_catd catalog, int with_path) MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0); if (catalog->file_ptr != (struct catalog_obj *) -1) /* Tell the world we managed to mmap the file. */ - catalog->status = mmaped; + catalog->status = mmapped; else { /* mmap failed perhaps because the system call is not @@ -229,7 +229,7 @@ __open_catalog (__nl_catd catalog, int with_path) { /* Illegal file. Free he resources and mark catalog as not usable. */ - if (catalog->status == mmaped) + if (catalog->status == mmapped) __munmap ((void *) catalog->file_ptr, catalog->file_size); else free (catalog->file_ptr); |