diff options
author | Elliott Hughes <enh@google.com> | 2013-06-18 11:05:15 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-18 11:05:15 -0700 |
commit | b1ff8e1ec240c5479be6b33835bfa59cf0895128 (patch) | |
tree | edc97e9f7a6c1069626c10ab7978b9b42a6b7903 | |
parent | b2c3f9d3d522bff6b0297ee9473a931516f4ccf6 (diff) | |
parent | bee007ce9eef1a9979e1fd13c61873bc164bb2d1 (diff) | |
download | android_external_elfutils-b1ff8e1ec240c5479be6b33835bfa59cf0895128.tar.gz android_external_elfutils-b1ff8e1ec240c5479be6b33835bfa59cf0895128.tar.bz2 android_external_elfutils-b1ff8e1ec240c5479be6b33835bfa59cf0895128.zip |
am bee007ce: Merge "Don\'t build a broken getline when bionic has a working one."
* commit 'bee007ce9eef1a9979e1fd13c61873bc164bb2d1':
Don't build a broken getline when bionic has a working one.
-rw-r--r-- | bionic-fixup/AndroidFixup.h | 2 | ||||
-rw-r--r-- | bionic-fixup/getline.c | 49 | ||||
-rwxr-xr-x | libdw/Android.mk | 4 |
3 files changed, 0 insertions, 55 deletions
diff --git a/bionic-fixup/AndroidFixup.h b/bionic-fixup/AndroidFixup.h index e96d57ed..037af0f5 100644 --- a/bionic-fixup/AndroidFixup.h +++ b/bionic-fixup/AndroidFixup.h @@ -82,6 +82,4 @@ static inline char *stpcpy(char *dst, const char *src) /* forward declarations */ char * dgettext (const char * domainname, const char * msgid); -ssize_t getline(char **lineptr, size_t *n, FILE *stream); - #endif /* ANDROID_FIXUP_H */ diff --git a/bionic-fixup/getline.c b/bionic-fixup/getline.c deleted file mode 100644 index 041a5ed9..00000000 --- a/bionic-fixup/getline.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2012, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <stdio.h> - -ssize_t getline(char **lineptr, size_t *n, FILE *stream) -{ - char *ptr; - - ptr = fgetln(stream, n); - - if (ptr == NULL) { - return -1; - } - - /* Free the original ptr */ - if (*lineptr != NULL) free(*lineptr); - - /* Add one more space for '\0' */ - size_t len = n[0] + 1; - - /* Update the length */ - n[0] = len; - - /* Allocate a new buffer */ - *lineptr = malloc(len); - - /* Copy over the string */ - memcpy(*lineptr, ptr, len-1); - - /* Write the NULL character */ - (*lineptr)[len-1] = '\0'; - - /* Return the length of the new buffer */ - return len; -} diff --git a/libdw/Android.mk b/libdw/Android.mk index 0822ced4..1e073166 100755 --- a/libdw/Android.mk +++ b/libdw/Android.mk @@ -151,10 +151,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(LIBDW_SRC_FILES) -# missing utility functions in bionic -LOCAL_SRC_FILES += \ - ../bionic-fixup/getline.c \ - LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../lib \ |