diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-02-08 16:44:31 +0000 |
commit | 78be84cd747c2e3965bf6c2fd5f702d6ff2f5525 (patch) | |
tree | c070a60ef7c5371bef8b7a559442a6920b394c8e /libc/gshadow | |
parent | de06548e980675e65a1e6d850bb8c3a3f7ec638d (diff) | |
download | eglibc2-78be84cd747c2e3965bf6c2fd5f702d6ff2f5525.tar.gz |
Merge changes between r16568 and r17050 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17051 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/gshadow')
-rw-r--r-- | libc/gshadow/gshadow.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/gshadow/gshadow.h b/libc/gshadow/gshadow.h index d0b28aeaa..5179bde63 100644 --- a/libc/gshadow/gshadow.h +++ b/libc/gshadow/gshadow.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -76,7 +76,7 @@ extern struct sgrp *getsgent (void); cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern struct sgrp *getsgnam (__const char *__name); +extern struct sgrp *getsgnam (const char *__name); /* Read shadow entry from STRING. @@ -84,7 +84,7 @@ extern struct sgrp *getsgnam (__const char *__name); cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern struct sgrp *sgetsgent (__const char *__string); +extern struct sgrp *sgetsgent (const char *__string); /* Read next shadow entry from STREAM. @@ -100,7 +100,7 @@ extern struct sgrp *fgetsgent (FILE *__stream); cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int putsgent (__const struct sgrp *__g, FILE *__stream); +extern int putsgent (const struct sgrp *__g, FILE *__stream); #ifdef __USE_MISC @@ -113,11 +113,11 @@ extern int putsgent (__const struct sgrp *__g, FILE *__stream); extern int getsgent_r (struct sgrp *__result_buf, char *__buffer, size_t __buflen, struct sgrp **__result); -extern int getsgnam_r (__const char *__name, struct sgrp *__result_buf, +extern int getsgnam_r (const char *__name, struct sgrp *__result_buf, char *__buffer, size_t __buflen, struct sgrp **__result); -extern int sgetsgent_r (__const char *__string, struct sgrp *__result_buf, +extern int sgetsgent_r (const char *__string, struct sgrp *__result_buf, char *__buffer, size_t __buflen, struct sgrp **__result); |