[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Remove xalloc.h dependency from parse-duration
From: |
Bruce Korb |
Subject: |
Remove xalloc.h dependency from parse-duration |
Date: |
Thu, 03 Mar 2011 14:16:49 -0800 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 |
xalloc.h drags in too much stuff:
diff --git a/lib/parse-duration.c b/lib/parse-duration.c
index 8c28133..7c8bdec 100644
--- a/lib/parse-duration.c
+++ b/lib/parse-duration.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "xalloc.h"
#ifndef NUL
#define NUL '\0'
@@ -406,13 +405,17 @@ trim (char * pz)
static time_t
parse_period (cch_t * in_pz)
{
- char * pz = xstrdup (in_pz);
- char * pT = strchr (pz, 'T');
+ char * pz = strdup (in_pz);
+ char * pT;
char * ps;
void * fptr = pz;
time_t res = 0;
- if (pT != NUL)
+ if (pz == NULL)
+ return BAD_TIME;
+
+ pT = strchr (pz, 'T');
+ if (pT != NULL)
{
*(pT++) = NUL;
pz = trim (pz);
diff --git a/modules/parse-duration b/modules/parse-duration
index 2e8f3d1..e36c917 100644
--- a/modules/parse-duration
+++ b/modules/parse-duration
@@ -6,7 +6,6 @@ lib/parse-duration.h
lib/parse-duration.c
Depends-on:
-xalloc
configure.ac:
AC_REQUIRE([AC_C_INLINE])
- Remove xalloc.h dependency from parse-duration,
Bruce Korb <=