search for: from_str

The OVF standard allows the use of SHA256 hashes in the manifest file. Adding support for this. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/input_ova.ml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 513fe30..5420c85 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -133,7 +133,7

...in > - let rex = Str.regexp "SHA1(\\(.*\\))= \\([0-9a-fA-F]+\\)\r?" in > + let rex = Str.regexp "SHA\\(1\\|256\\)(\\(.*\\))= \\([0-9a-fA-F]+\\)\r?" in For example, with the above suggestion, catching the whole checksum type in regex and passing it to a new Checksums.from_string function could allow to support any checksum type that Checksums knows about. Thanks, -- Pino Toscano

...t a/test/swfedit_token.c b/test/swfedit_token.c index f3623fc..b2210fd 100644 --- a/test/swfedit_token.c +++ b/test/swfedit_token.c @@ -125,6 +125,21 @@ swfedit_to_string_unsigned (gconstpointe return g_strdup_printf ("%u", GPOINTER_TO_UINT (value)); } +static gboolean +swfedit_rect_from_string (const char *s, gpointer* result) +{ + return FALSE; +} + +static char * +swfedit_rect_to_string (gconstpointer value) +{ + const SwfdecRect *rect = value; + + return g_strdup_printf ("%d, %d, %d, %d", (int) rect->x0, (int) rect->y0, + (int) rect->x1, (int) rect->y1...

...ch 'interpreter' of ssh://company at git.freedesktop.org/git/swfdec into interpreter make it not crash print the actual tag name ensure _get_nth_child works with token == NULL make parsing binary data work enable editing of properties change read/write to from_string/to_string add stubs for saving export the entry format and rename it to SwfeditTokenEntry ignore 0-length buffers in bufferqueue we don't have the header in the uncompressed buffer We need at least gtk-2.8 add swfedit implement saving remove de...

...;a' && s[0] <= 'f') + byte += s[0] + 10 - 'a'; + else if (s[0] >= 'A' && s[0] <= 'F') + byte += s[0] + 10 - 'A'; + else + return FALSE; + *result = byte; + return TRUE; +} + +static gboolean +swfedit_binary_from_string (const char *s, gpointer* result) +{ + GByteArray *array = g_byte_array_new (); + guint byte; + guint8 add; + + while (g_ascii_isspace (*s)) s++; + do { + if (!swfedit_parse_hex (s, &byte)) + break; + s += 2; + add = byte; + g_byte_array_append (array, &...

...>= 'a' && s[0] <= 'f') + byte += s[0] + 10 - 'a'; + else if (s[0] >= 'A' && s[0] <= 'F') + byte += s[0] + 10 - 'A'; + else + return FALSE; + *result = byte; + return TRUE; +} + +static gboolean swfedit_binary_from_string (const char *s, gpointer* result) { GByteArray *array = g_byte_array_new (); - guint8 byte; + guint byte; + guint8 add; while (g_ascii_isspace (*s)) s++; do { - if (s[0] >= '0' && s[0] <= '9') - byte = s[0] - '0'; - else if (s[0] &g...

...;a' && s[0] <= 'f') + byte += s[0] + 10 - 'a'; + else if (s[0] >= 'A' && s[0] <= 'F') + byte += s[0] + 10 - 'A'; + else + return FALSE; + *result = byte; + return TRUE; +} + +static gboolean +swfedit_binary_from_string (const char *s, gpointer* result) +{ + GByteArray *array = g_byte_array_new (); + guint byte; + guint8 add; + + while (g_ascii_isspace (*s)) s++; + do { + if (!swfedit_parse_hex (s, &byte)) + break; + s += 2; + add = byte; + g_byte_array_append (array, &...

...ror saving file: %s\n", error->message); - g_error_free (error); - } - } - gtk_widget_destroy (dialog); -} - -static void -cell_renderer_edited (GtkCellRenderer *renderer, char *path, - char *new_text, SwfeditFile *file) -{ - GtkTreeIter iter; - - if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (file), - &iter, path)) { - g_assert_not_reached (); - } - swfedit_token_set_iter (SWFEDIT_TOKEN (file), &iter, new_text); -} - -static gboolean -open_window (char *filename) -{ - SwfeditFile *file; - GtkWidget *window, *scroll, *box, *button, *treeview; - GError...

...ranch 'interpreter' of ssh://company@git.freedesktop.org/git/swfdec into interpreter make it not crash print the actual tag name ensure _get_nth_child works with token == NULL make parsing binary data work enable editing of properties change read/write to from_string/to_string add stubs for saving export the entry format and rename it to SwfeditTokenEntry ignore 0-length buffers in bufferqueue we don't have the header in the uncompressed buffer We need at least gtk-2.8 add swfedit implement saving remove de...

This is v3 of my disk series. What were previously patches 01-06 have been applied. These are the tested and updated remainder, addressing the previous comments. 1 Preparatory work. 2-4 The new parser and its documentation. 5-6 Replace old parsers with calls to the new one. 7-8 Two features, one of them essential. 9 Basic test suite for disk string parsing, as adhoc script.

...ranch 'interpreter' of ssh://company@git.freedesktop.org/git/swfdec into interpreter make it not crash print the actual tag name ensure _get_nth_child works with token == NULL make parsing binary data work enable editing of properties change read/write to from_string/to_string add stubs for saving export the entry format and rename it to SwfeditTokenEntry ignore 0-length buffers in bufferqueue we don't have the header in the uncompressed buffer We need at least gtk-2.8 add swfedit implement saving remove de...

..., + [SWFDEC_TAG_DOINITACTION] = DoInitAction, }; static const SwfeditTagDefinition * diff --git a/test/swfedit_token.c b/test/swfedit_token.c index 9155b94..005e6c1 100644 --- a/test/swfedit_token.c +++ b/test/swfedit_token.c @@ -364,6 +364,7 @@ struct { { swfedit_matrix_new, swfedit_matrix_from_string, swfedit_matrix_to_string, g_free }, { swfedit_ctrans_new, swfedit_ctrans_from_string, swfedit_ctrans_to_string, g_free }, { swfedit_script_new, swfedit_script_from_string, swfedit_script_to_string, swfedit_script_free }, + { NULL, swfedit_uint32_from_string, swfedit_to_string_unsigned, N...