projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
str: Add function xstrdup_if_nonnull() and introduce many users.
[pspp]
/
src
/
output
/
driver.c
diff --git
a/src/output/driver.c
b/src/output/driver.c
index a4718c939aaf79c04dbe504856a9fd72b0eeb17e..824a1ee2112a0810fe72fc83199cf8ca52015ed2 100644
(file)
--- a/
src/output/driver.c
+++ b/
src/output/driver.c
@@
-227,9
+227,8
@@
output_submit (struct output_item *item)
if (e->n_groups >= e->allocated_groups)
e->groups = x2nrealloc (e->groups, &e->allocated_groups,
sizeof *e->groups);
if (e->n_groups >= e->allocated_groups)
e->groups = x2nrealloc (e->groups, &e->allocated_groups,
sizeof *e->groups);
- e->groups[e->n_groups] = (group_open_item->command_name
- ? xstrdup (group_open_item->command_name)
- : NULL);
+ e->groups[e->n_groups] = xstrdup_if_nonnull (
+ group_open_item->command_name);
e->n_groups++;
}
else if (is_group_close_item (item))
e->n_groups++;
}
else if (is_group_close_item (item))
@@
-298,7
+297,7
@@
static void
output_set_title__ (struct output_engine *e, char **dst, const char *src)
{
free (*dst);
output_set_title__ (struct output_engine *e, char **dst, const char *src)
{
free (*dst);
- *dst =
src ? xstrdup (src) : NULL
;
+ *dst =
xstrdup_if_nonnull (src)
;
char *page_title
= (e->title && e->subtitle ? xasprintf ("%s\n%s", e->title, e->subtitle)
char *page_title
= (e->title && e->subtitle ? xasprintf ("%s\n%s", e->title, e->subtitle)