From 4ba7155d789334e7e0c1cee01dfc79cb193240c2 Mon Sep 17 00:00:00 2001 From: Felicity Tarnell Date: Wed, 5 Mar 2014 16:32:04 +0000 Subject: [PATCH] T.83.4: Handle auto_non_billable in entry_new(). --- configure | 18 +++++++++--------- configure.ac | 2 +- tts.c | 11 +++-------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/configure b/configure index f90ef29..735cc19 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for RT/TTS T.83.3. +# Generated by GNU Autoconf 2.69 for RT/TTS T.83.4. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RT/TTS' PACKAGE_TARNAME='rt-tts' -PACKAGE_VERSION='T.83.3' -PACKAGE_STRING='RT/TTS T.83.3' +PACKAGE_VERSION='T.83.4' +PACKAGE_STRING='RT/TTS T.83.4' PACKAGE_BUGREPORT='felicity@loreley.flyingparchment.org.uk' PACKAGE_URL='' @@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures RT/TTS T.83.3 to adapt to many kinds of systems. +\`configure' configures RT/TTS T.83.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1293,7 +1293,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RT/TTS T.83.3:";; + short | recursive ) echo "Configuration of RT/TTS T.83.4:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RT/TTS configure T.83.3 +RT/TTS configure T.83.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1749,7 +1749,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by RT/TTS $as_me T.83.3, which was +It was created by RT/TTS $as_me T.83.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4766,7 +4766,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RT/TTS $as_me T.83.3, which was +This file was extended by RT/TTS $as_me T.83.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4828,7 +4828,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RT/TTS config.status T.83.3 +RT/TTS config.status T.83.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 91eaf85..d08577f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([RT/TTS], [T.83.3], [felicity@loreley.flyingparchment.org.uk]) +AC_INIT([RT/TTS], [T.83.4], [felicity@loreley.flyingparchment.org.uk]) AC_CONFIG_SRCDIR([tts.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/tts.c b/tts.c index a54da5b..53eb15b 100644 --- a/tts.c +++ b/tts.c @@ -784,10 +784,6 @@ entry_t *en; return; } en = entry_new(name); - - if (auto_nonbillable && STRSTR(name, auto_nonbillable)) - en->en_flags.efl_nonbillable = 1; - entry_start(en); curent = en; save(); @@ -806,10 +802,6 @@ entry_t *en; } en = entry_new(name); - - if (auto_nonbillable && STRSTR(name, auto_nonbillable)) - en->en_flags.efl_nonbillable = 1; - curent = en; kedtime(); save(); @@ -2000,6 +1992,9 @@ entry_t *en; if ((en = calloc(1, sizeof(*en))) == NULL) return NULL; + if (auto_nonbillable && STRSTR(desc, auto_nonbillable)) + en->en_flags.efl_nonbillable = 1; + TAILQ_INSERT_HEAD(&entries, en, en_entries); en->en_desc = STRDUP(desc);