Optimize a bit by using mempcpy.

[kopensolaris-gnu/glibc.git] / nss / nsswitch.c

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 16cf0e8..36c1d00 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -35,12 +35,14 @@
 #include "nsswitch.h"
 
 /* Prototypes for the local functions.  */
-static void *nss_lookup_function (service_user *ni, const char *fct_name);
-static name_database *nss_parse_file (const char *fname);
-static name_database_entry *nss_getline (char *line);
-static service_user *nss_parse_service_list (const char *line);
+static void *nss_lookup_function (service_user *ni, const char *fct_name)
+     internal_function;
+static name_database *nss_parse_file (const char *fname) internal_function;
+static name_database_entry *nss_getline (char *line) internal_function;
+static service_user *nss_parse_service_list (const char *line)
+     internal_function;
 static service_library *nss_new_service (name_database *database,
-                                        const char *name);
+                                        const char *name) internal_function;
 
 
 /* Declare external database variables.  */
@@ -310,6 +312,7 @@ known_compare (const void *p1, const void *p2)
 
 
 static void *
+internal_function
 nss_lookup_function (service_user *ni, const char *fct_name)
 {
   void **found, *result;
@@ -426,13 +429,13 @@ nss_lookup_function (service_user *ni, const char *fct_name)
            extern void _nss_##h##_get##nm##_r (void);
 # define DEFINE_GETBY(h,nm,ky)                                               \
            extern void _nss_##h##_get##nm##by##ky##_r (void);
-# include "functions.def"
+# include "function.def"
 # undef DEFINE_ENT
 # undef DEFINE_GET
 # undef DEFINE_GETBY
 # define DEFINE_ENT(h,nm)                                                    \
-           { #h"_get"#nm"ent_r", _nss_##h##_get##nm##ent_r },        \
-           { #h"_end"#nm"ent", _nss_##h##_end##nm##ent },            \
+           { #h"_get"#nm"ent_r", _nss_##h##_get##nm##ent_r },                \
+           { #h"_end"#nm"ent", _nss_##h##_end##nm##ent },                    \
            { #h"_set"#nm"ent", _nss_##h##_set##nm##ent },
 # define DEFINE_GET(h,nm)                                                    \
            { #h"_get"#nm"_r", _nss_##h##_get##nm##_r },
@@ -440,7 +443,7 @@ nss_lookup_function (service_user *ni, const char *fct_name)
            { #h"_get"#nm"by"#ky"_r", _nss_##h##_get##nm##by##ky##_r },
            static struct fct_tbl { const char *fname; void *fp; } *tp, tbl[] =
              {
-# include "functions.def"
+# include "function.def"
                { NULL, NULL }
              };
            size_t namlen = (5 + strlen (ni->library->name) + 1
@@ -476,6 +479,7 @@ nss_lookup_function (service_user *ni, const char *fct_name)
 
 
 static name_database *
+internal_function
 nss_parse_file (const char *fname)
 {
   FILE *fp;
@@ -548,6 +552,7 @@ nss_parse_file (const char *fname)
        `( <source> ( "[" "!"? (<status> "=" <action> )+ "]" )? )*'
    */
 static service_user *
+internal_function
 nss_parse_service_list (const char *line)
 {
   service_user *result = NULL, **nextp = &result;
@@ -582,8 +587,7 @@ nss_parse_service_list (const char *line)
              free (new_service);
              return result;
            }
-         memcpy (source, name, line - name);
-         source[line - name] = '\0';
+         *((char *) __mempcpy (source, name, line - name)) = '\0';
 
          new_service->name = source;
        }
@@ -697,6 +701,7 @@ nss_parse_service_list (const char *line)
 }
 
 static name_database_entry *
+internal_function
 nss_getline (char *line)
 {
   const char *name;
@@ -743,6 +748,7 @@ nss_getline (char *line)
 
 
 static service_library *
+internal_function
 nss_new_service (name_database *database, const char *name)
 {
   service_library **currentp = &database->library;