diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-05-13 10:21:43 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-05-13 10:33:34 +0300 |
commit | de3fbe3e8d4dd2a89f7755906d76055784c437cc (patch) | |
tree | 65356dd7b5a9010499550c468e960c93515a7e15 /src/timer.c | |
parent | f569a6f2628b9ddef4dfb4424aff2dad644a8f19 (diff) | |
download | wydawca-de3fbe3e8d4dd2a89f7755906d76055784c437cc.tar.gz wydawca-de3fbe3e8d4dd2a89f7755906d76055784c437cc.tar.bz2 |
Drop gnulib.
* bootstrap: Rewrite.
* bootstrap.conf: Remove.
* configure.ac: Remove gl_EARLY/gl_INIT
* src/backup.c: New file.
* src/txtacc.c (txtacc_finish): Make sure a new entry is
appended only once to the list.
* (all sources): Use grecs memory allocation functions.
* src/wydawca.h" Include fnmatch.h and regex.h
(backup_type): New enum.
(simple_backup_suffix): New extern.
(find_backup_file_name): New proto.
* tests/bkupname.c: New file.
* tests/backup00.at: New file.
* tests/backup01.at: New file.
* tests/backup02.at: New file.
* tests/backup03.at: New file.
* tests/Makefile.am: Add new tests.
* tests/testsuite.at: Add new tests.
* grecs: Update.
Diffstat (limited to 'src/timer.c')
-rw-r--r-- | src/timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/timer.c b/src/timer.c index 1634462..cece63a 100644 --- a/src/timer.c +++ b/src/timer.c | |||
@@ -17,13 +17,12 @@ | |||
17 | #include <wydawca.h> | 17 | #include <wydawca.h> |
18 | #include <sys/time.h> | 18 | #include <sys/time.h> |
19 | #include <sys/resource.h> | 19 | #include <sys/resource.h> |
20 | #include <unistd.h> | 20 | #include <unistd.h> |
21 | #include <string.h> | 21 | #include <string.h> |
22 | #include <ctype.h> | 22 | #include <ctype.h> |
23 | #include <xalloc.h> | ||
24 | 23 | ||
25 | struct timer_slot | 24 | struct timer_slot |
26 | { | 25 | { |
27 | char *name; | 26 | char *name; |
28 | double real; | 27 | double real; |
29 | double self_user; /* user time in sec */ | 28 | double self_user; /* user time in sec */ |
@@ -179,13 +178,13 @@ timer_format_time (double t) | |||
179 | else if (h) | 178 | else if (h) |
180 | grecs_asprintf (&str, &size, "%02ld:%02ld:%02ld", h, m, s); | 179 | grecs_asprintf (&str, &size, "%02ld:%02ld:%02ld", h, m, s); |
181 | else | 180 | else |
182 | grecs_asprintf (&str, &size, "%02ld:%02ld", m, s); | 181 | grecs_asprintf (&str, &size, "%02ld:%02ld", m, s); |
183 | } | 182 | } |
184 | if (!str) | 183 | if (!str) |
185 | xalloc_die (); | 184 | grecs_alloc_die (); |
186 | return str; | 185 | return str; |
187 | } | 186 | } |
188 | 187 | ||
189 | size_t | 188 | size_t |
190 | timer_get_count () | 189 | timer_get_count () |
191 | { | 190 | { |
@@ -207,13 +206,13 @@ _fill_meta (void *sym, void *data) | |||
207 | if (tp->num) \ | 206 | if (tp->num) \ |
208 | { \ | 207 | { \ |
209 | char *buf = NULL; \ | 208 | char *buf = NULL; \ |
210 | size_t size = 0; \ | 209 | size_t size = 0; \ |
211 | grecs_asprintf (&buf, &size, "timer:%s:%s", slot->name, #arg); \ | 210 | grecs_asprintf (&buf, &size, "timer:%s:%s", slot->name, #arg); \ |
212 | if (!buf) \ | 211 | if (!buf) \ |
213 | xalloc_die (); \ | 212 | grecs_alloc_die (); \ |
214 | tp->def->kw = buf; \ | 213 | tp->def->kw = buf; \ |
215 | tp->def->storage = timer_format_time (__cat2__(timer_get_,arg) (slot)); \ | 214 | tp->def->storage = timer_format_time (__cat2__(timer_get_,arg) (slot)); \ |
216 | tp->def->value = tp->def->storage; \ | 215 | tp->def->value = tp->def->storage; \ |
217 | tp->def->expand = NULL; \ | 216 | tp->def->expand = NULL; \ |
218 | tp->def++; \ | 217 | tp->def++; \ |
219 | tp->num--; \ | 218 | tp->num--; \ |