projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
message: New function msg_location_merged().
[pspp]
/
src
/
libpspp
/
message.c
diff --git
a/src/libpspp/message.c
b/src/libpspp/message.c
index 83c7320168eef5a8ca4cf68baaa6c129bd98dd0d..38726d9f5b4827661940d8500e9294a85b785d79 100644
(file)
--- a/
src/libpspp/message.c
+++ b/
src/libpspp/message.c
@@
-174,6
+174,16
@@
msg_location_merge (struct msg_location **dstp, const struct msg_location *src)
dst->end = src->end;
}
dst->end = src->end;
}
+struct msg_location *
+msg_location_merged (const struct msg_location *a,
+ const struct msg_location *b)
+{
+ struct msg_location *new = msg_location_dup (a);
+ if (b)
+ msg_location_merge (&new, b);
+ return new;
+}
+
struct msg_location *
msg_location_dup (const struct msg_location *src)
{
struct msg_location *
msg_location_dup (const struct msg_location *src)
{