# HG changeset patch # User renatofilho # Date 1179337629 -3600 # Node ID 5ee8c970d982df1097eb1d6c012717a83b6a40f2 # Parent 4e623a4274a1e85b66da345ba19dcc38a8de1448 [svn r679] removed function to parse long_long strings diff -r 4e623a4274a1 -r 5ee8c970d982 gmyth/src/gmyth_file_transfer.c --- a/gmyth/src/gmyth_file_transfer.c Wed May 16 18:46:10 2007 +0100 +++ b/gmyth/src/gmyth_file_transfer.c Wed May 16 18:47:09 2007 +0100 @@ -412,7 +412,7 @@ /* Myth URI stream file size - decoded using two 8-bytes sequences (64 bits/long long types) */ gmyth_file_set_filesize (GMYTH_FILE (transfer), - gmyth_util_decode_long_long (strlist, 2)); + gmyth_string_list_get_int64 (strlist, 2)); gmyth_debug ("***** Received: recordernum = %d, filesize = %" G_GUINT64_FORMAT "\n", priv->file_id, diff -r 4e623a4274a1 -r 5ee8c970d982 gmyth/src/gmyth_recorder.c --- a/gmyth/src/gmyth_recorder.c Wed May 16 18:46:10 2007 +0100 +++ b/gmyth/src/gmyth_recorder.c Wed May 16 18:47:09 2007 +0100 @@ -1032,7 +1032,7 @@ if ( str_list != NULL && gmyth_string_list_length(str_list)> 0) { GString *str= NULL; if ( ( str = gmyth_string_list_get_string( str_list, 0 ) ) != NULL && strstr( str->str, "bad")== NULL) - pos = gmyth_util_decode_long_long( str_list, 0); + pos = gmyth_string_list_get_int64 ( str_list, 0); g_string_free( str, TRUE ); } diff -r 4e623a4274a1 -r 5ee8c970d982 gmyth/src/gmyth_util.c --- a/gmyth/src/gmyth_util.c Wed May 16 18:46:10 2007 +0100 +++ b/gmyth/src/gmyth_util.c Wed May 16 18:47:09 2007 +0100 @@ -381,38 +381,6 @@ } /** - * Decodes a long long variable from the string list - * format of the myhtprotocol. - * - * @param strlist the string list of mythprotocol values - * @param offset the list node offset of the long long variable - * - * @return gint64 the long long converted value - */ -gint64 -gmyth_util_decode_long_long(GMythStringList *strlist, guint offset) -{ - - gint64 ret_value = 0LL; - - g_return_val_if_fail( strlist != NULL, ret_value ); - - if ( offset > gmyth_string_list_length( strlist )) - g_printerr( "[%s] Offset is greater than the Stringlist (offset = %d)!\n", - __FUNCTION__, offset ); - - g_return_val_if_fail( offset < gmyth_string_list_length( strlist ), ret_value ); - - gint l1 = gmyth_string_list_get_int( strlist, offset ); - gint l2 = gmyth_string_list_get_int( strlist, offset + 1 ); - - ret_value = (l2 /*& 0xffffffffLL*/) | ( (gint64)l1 << 32 ); - - return ret_value; - -} - -/** * Checks if the given remote file exists. * * @param backend_info The GMythBackendInfo instance. diff -r 4e623a4274a1 -r 5ee8c970d982 gmyth/src/gmyth_util.h --- a/gmyth/src/gmyth_util.h Wed May 16 18:46:10 2007 +0100 +++ b/gmyth/src/gmyth_util.h Wed May 16 18:47:09 2007 +0100 @@ -42,8 +42,6 @@ GString *gmyth_util_time_to_isoformat(time_t time_value); GString *gmyth_util_time_to_string (time_t time_value); time_t gmyth_util_string_to_time (GString* time_str); -gint64 gmyth_util_decode_long_long (GMythStringList *strlist, - guint offset); gchar* gmyth_util_time_to_isoformat_from_time_val_fmt ( const gchar *fmt_string, const GTimeVal* time_val );