mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update.

Browse Source 
2001-09-04  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-object.c (_dl_new_object): Remove unnecessary if.
This commit is contained in:
Ulrich Drepper 2001-09-04 07:50:46 +00:00
parent 0668d223a5
commit 903244ac3c
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2001-09-04 Ulrich Drepper <drepper@redhat.com>
* elf/dl-object.c (_dl_new_object): Remove unnecessary if.
2001-09-02 Ulrich Drepper <drepper@redhat.com>
* elf/rtld.c (dl_main): Increment l_opencount for main binary.

7
elf/dl-object.c
View File

@ -91,7 +91,7 @@ _dl_new_object (char *realname, const char *libname, int type,
/* It an absolute path. Use it. But we have to make a copy since
we strip out the trailing slash. */
size_t len = strlen (realname) + 1;
origin = malloc (len);
origin = (char *) malloc (len);
if (origin == NULL)
origin = (char *) -1;
else
@ -104,7 +104,7 @@ _dl_new_object (char *realname, const char *libname, int type,
char *result = NULL;
/* Get the current directory name. */
origin = malloc (len);
origin = (char *) malloc (len);
while (origin != NULL
&& (result = __getcwd (origin, len - realname_len)) == NULL
@ -117,8 +117,7 @@ _dl_new_object (char *realname, const char *libname, int type,
if (result == NULL)
{
/* We were not able to determine the current directory. */
if (origin != NULL)
free (origin);
free (origin);
origin = (char *) -1;
}
else

47
sysdeps/unix/sysv/linux/alpha/gethostname.c Normal file
View File

@ -0,0 +1,47 @@
/* Copyright (C) 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <string.h>
#include <unistd.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
int
__gethostname (char *name, size_t len)
{
int result;
result = INLINE_SYSCALL (gethostname, 2, CHECK_N (name, len), len);
if (result == 0
/* See whether the string is terminated. If not we will return
an error. */
&& memchr (name, '\0', len) == NULL)
{
__set_errno (EOVERFLOW);
result = -1;
}
return result;
}
weak_alias (__gethostname, gethostname)