packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Add API to convert checksum -> csum in place 

We already have the opposite, and this will be used in some
places to avoid a malloc.

https://bugzilla.gnome.org/show_bug.cgi?id=706031
This commit is contained in:
Colin Walters 2013-08-14 18:17:09 -04:00
parent 76cd7ae4ea
commit d9f59c6fd5
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libostree/ostree-core.c
View File

@ -972,8 +972,16 @@ ostree_object_name_deserialize (GVariant *variant,
*out_objtype = (OstreeObjectType)objtype_u32; *out_objtype = (OstreeObjectType)objtype_u32;
} }
static void /**
checksum_to_bytes (const char *checksum, * ostree_checksum_inplace_to_bytes:
* @checksum: a SHA256 string
* @buf: Output buffer with at least 32 bytes of space
*
* Convert @checksum from a string to binary in-place, without
* allocating memory. Use this function in hot code paths.
*/
void
ostree_checksum_inplace_to_bytes (const char *checksum,
guchar *buf) guchar *buf)
{ {
guint i; guint i;
@ -1000,7 +1008,7 @@ guchar *
ostree_checksum_to_bytes (const char *checksum) ostree_checksum_to_bytes (const char *checksum)
{ {
guchar *ret = g_malloc (32); guchar *ret = g_malloc (32);
checksum_to_bytes (checksum, ret); ostree_checksum_inplace_to_bytes (checksum, ret);
return ret; return ret;
} }
@ -1008,7 +1016,7 @@ GVariant *
ostree_checksum_to_bytes_v (const char *checksum) ostree_checksum_to_bytes_v (const char *checksum)
{ {
guchar result[32]; guchar result[32];
checksum_to_bytes (checksum, result); ostree_checksum_inplace_to_bytes (checksum, result);
return ot_gvariant_new_bytearray ((guchar*)result, 32); return ot_gvariant_new_bytearray ((guchar*)result, 32);
} }

3
src/libostree/ostree-core.h
View File

@ -132,6 +132,9 @@ char * ostree_checksum_from_bytes_v (GVariant *bytes);
void ostree_checksum_inplace_from_bytes (const guchar *bytes, void ostree_checksum_inplace_from_bytes (const guchar *bytes,
char *buf); char *buf);
void ostree_checksum_inplace_to_bytes (const char *checksum,
guchar *buf);
const guchar *ostree_checksum_bytes_peek (GVariant *bytes); const guchar *ostree_checksum_bytes_peek (GVariant *bytes);
int ostree_cmp_checksum_bytes (const guchar *a, const guchar *b); int ostree_cmp_checksum_bytes (const guchar *a, const guchar *b);