1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-10 04:43:00 +03:00

parse-duration: remove xalloc.h dependency

* lib/parse-duration.c (parse_period): handle NULL return from
strdup instead of calling xstrdup().
* modules/parse-duration: remove "xalloc" dependency
This commit is contained in:
Bruce Korb
2011-03-03 15:07:32 -08:00
parent 329c5b59c9
commit 10169d19c6
3 changed files with 18 additions and 6 deletions

View File

@@ -1,3 +1,10 @@
2011-03-03 Bruce Korb <bkorb@gnu.org>
parse-duration: remove xalloc.h dependency
* lib/parse-duration.c (parse_period): handle NULL return from
strdup instead of calling xstrdup().
* modules/parse-duration: remove "xalloc" dependency
2011-03-03 Matthew Booth <mbooth@redhat.com>
bootstrap: honor m4_base when running aclocal

View File

@@ -26,7 +26,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "xalloc.h"
#ifndef NUL
#define NUL '\0'
@@ -381,7 +380,7 @@ parse_time (cch_t * pz)
}
/* Returns a substring of the given string, with spaces at the beginning and at
the end destructively removed. */
the end destructively removed, per SNOBOL. */
static char *
trim (char * pz)
{
@@ -406,13 +405,20 @@ trim (char * pz)
static time_t
parse_period (cch_t * in_pz)
{
char * pz = xstrdup (in_pz);
char * pT = strchr (pz, 'T');
char * pT;
char * ps;
char * pz = strdup (in_pz);
void * fptr = pz;
time_t res = 0;
if (pT != NUL)
if (pz == NULL)
{
errno = ENOMEM;
return BAD_TIME;
}
pT = strchr (pz, 'T');
if (pT != NULL)
{
*(pT++) = NUL;
pz = trim (pz);

View File

@@ -6,7 +6,6 @@ lib/parse-duration.h
lib/parse-duration.c
Depends-on:
xalloc
configure.ac:
AC_REQUIRE([AC_C_INLINE])