* commit '602886de86c45016e276cc63fa8f67e1596c97f8': Remove a non-standard turd: strtotimeval.
This commit is contained in:
@@ -71,7 +71,6 @@ libc_common_src_files := \
|
||||
bionic/sigsetmask.c \
|
||||
bionic/strntoimax.c \
|
||||
bionic/strntoumax.c \
|
||||
bionic/strtotimeval.c \
|
||||
bionic/system_properties_compat.c \
|
||||
bionic/time64.c \
|
||||
bionic/unlockpt.c \
|
||||
|
@@ -29,6 +29,8 @@
|
||||
// This file perpetuates the mistakes of the past, but only for 32-bit targets.
|
||||
#if !defined(__LP64__)
|
||||
|
||||
#include <ctype.h>
|
||||
#include <inttypes.h>
|
||||
#include <pthread.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/resource.h>
|
||||
@@ -87,4 +89,31 @@ extern "C" int pthread_attr_getstackaddr(const pthread_attr_t* attr, void** stac
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Non-standard cruft that should only ever have been in system/core/toolbox.
|
||||
extern "C" char* strtotimeval(const char* str, struct timeval* ts) {
|
||||
char* s;
|
||||
ts->tv_sec = strtoumax(str, &s, 10);
|
||||
|
||||
long fractional_seconds = 0;
|
||||
if (*s == '.') {
|
||||
s++;
|
||||
int count = 0;
|
||||
|
||||
// Read up to 6 digits (microseconds).
|
||||
while (*s && isdigit(*s)) {
|
||||
if (++count < 7) {
|
||||
fractional_seconds = fractional_seconds*10 + (*s - '0');
|
||||
}
|
||||
s++;
|
||||
}
|
||||
|
||||
for (; count < 6; count++) {
|
||||
fractional_seconds *= 10;
|
||||
}
|
||||
}
|
||||
|
||||
ts->tv_usec = fractional_seconds;
|
||||
return s;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@@ -1,58 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2008 The Android Open Source Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
#include <ctype.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
char * strtotimeval(const char *str, struct timeval *ts) {
|
||||
char *s;
|
||||
long fs = 0; /* fractional seconds */
|
||||
|
||||
ts->tv_sec = strtoumax(str, &s, 10);
|
||||
|
||||
if (*s == '.') {
|
||||
s++;
|
||||
int count = 0;
|
||||
|
||||
/* read up to 6 digits (microseconds) */
|
||||
while (*s && isdigit(*s)) {
|
||||
if (++count < 7) {
|
||||
fs = fs*10 + (*s - '0');
|
||||
}
|
||||
s++;
|
||||
}
|
||||
|
||||
for (; count < 6; count++) {
|
||||
fs *= 10;
|
||||
}
|
||||
}
|
||||
|
||||
ts->tv_usec = fs;
|
||||
return s;
|
||||
}
|
@@ -61,8 +61,6 @@ struct tm {
|
||||
extern time_t time(time_t*);
|
||||
extern int nanosleep(const struct timespec*, struct timespec*);
|
||||
|
||||
extern char* strtotimeval(const char*, struct timeval*);
|
||||
|
||||
extern char* asctime(const struct tm*);
|
||||
extern char* asctime_r(const struct tm*, char*);
|
||||
|
||||
|
Reference in New Issue
Block a user