summaryrefslogtreecommitdiff
path: root/common/attrs.h
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-03-14 11:23:47 +0100
committerStef Walter <stefw@gnome.org>2013-03-15 17:51:59 +0100
commit3fc6365093ad07b2eb5ef859093c5c5eb56ee700 (patch)
tree18332bdad7f9c7d7057c0af0f3226521efca31bb /common/attrs.h
parent5208fc8539aabc626c1699f181e1191d6bb1c787 (diff)
attrs: New p11_attrs_merge() function
This takes one set of attributes and merges them into another, without copying memory needlessly. https://bugs.freedesktop.org/show_bug.cgi?id=62329
Diffstat (limited to 'common/attrs.h')
-rw-r--r--common/attrs.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/attrs.h b/common/attrs.h
index 870f0d1..4e3f46c 100644
--- a/common/attrs.h
+++ b/common/attrs.h
@@ -55,6 +55,10 @@ CK_ATTRIBUTE * p11_attrs_take (CK_ATTRIBUTE *attrs,
CK_VOID_PTR value,
CK_ULONG length);
+CK_ATTRIBUTE * p11_attrs_merge (CK_ATTRIBUTE *attrs,
+ CK_ATTRIBUTE *merge,
+ bool replace);
+
bool p11_attrs_is_empty (const CK_ATTRIBUTE *attrs);
CK_ULONG p11_attrs_count (const CK_ATTRIBUTE *attrs);