1.1 --- a/gmyth/src/gmyth_file_transfer.c Wed May 16 18:46:10 2007 +0100
1.2 +++ b/gmyth/src/gmyth_file_transfer.c Wed May 16 18:47:09 2007 +0100
1.3 @@ -412,7 +412,7 @@
1.4
1.5 /* Myth URI stream file size - decoded using two 8-bytes sequences (64 bits/long long types) */
1.6 gmyth_file_set_filesize (GMYTH_FILE (transfer),
1.7 - gmyth_util_decode_long_long (strlist, 2));
1.8 + gmyth_string_list_get_int64 (strlist, 2));
1.9
1.10 gmyth_debug ("***** Received: recordernum = %d, filesize = %"
1.11 G_GUINT64_FORMAT "\n", priv->file_id,
2.1 --- a/gmyth/src/gmyth_recorder.c Wed May 16 18:46:10 2007 +0100
2.2 +++ b/gmyth/src/gmyth_recorder.c Wed May 16 18:47:09 2007 +0100
2.3 @@ -1032,7 +1032,7 @@
2.4 if ( str_list != NULL && gmyth_string_list_length(str_list)> 0) {
2.5 GString *str= NULL;
2.6 if ( ( str = gmyth_string_list_get_string( str_list, 0 ) ) != NULL && strstr( str->str, "bad")== NULL)
2.7 - pos = gmyth_util_decode_long_long( str_list, 0);
2.8 + pos = gmyth_string_list_get_int64 ( str_list, 0);
2.9 g_string_free( str, TRUE );
2.10 }
2.11
3.1 --- a/gmyth/src/gmyth_util.c Wed May 16 18:46:10 2007 +0100
3.2 +++ b/gmyth/src/gmyth_util.c Wed May 16 18:47:09 2007 +0100
3.3 @@ -381,38 +381,6 @@
3.4 }
3.5
3.6 /**
3.7 - * Decodes a long long variable from the string list
3.8 - * format of the myhtprotocol.
3.9 - *
3.10 - * @param strlist the string list of mythprotocol values
3.11 - * @param offset the list node offset of the long long variable
3.12 - *
3.13 - * @return gint64 the long long converted value
3.14 - */
3.15 -gint64
3.16 -gmyth_util_decode_long_long(GMythStringList *strlist, guint offset)
3.17 -{
3.18 -
3.19 - gint64 ret_value = 0LL;
3.20 -
3.21 - g_return_val_if_fail( strlist != NULL, ret_value );
3.22 -
3.23 - if ( offset > gmyth_string_list_length( strlist ))
3.24 - g_printerr( "[%s] Offset is greater than the Stringlist (offset = %d)!\n",
3.25 - __FUNCTION__, offset );
3.26 -
3.27 - g_return_val_if_fail( offset < gmyth_string_list_length( strlist ), ret_value );
3.28 -
3.29 - gint l1 = gmyth_string_list_get_int( strlist, offset );
3.30 - gint l2 = gmyth_string_list_get_int( strlist, offset + 1 );
3.31 -
3.32 - ret_value = (l2 /*& 0xffffffffLL*/) | ( (gint64)l1 << 32 );
3.33 -
3.34 - return ret_value;
3.35 -
3.36 -}
3.37 -
3.38 -/**
3.39 * Checks if the given remote file exists.
3.40 *
3.41 * @param backend_info The GMythBackendInfo instance.
4.1 --- a/gmyth/src/gmyth_util.h Wed May 16 18:46:10 2007 +0100
4.2 +++ b/gmyth/src/gmyth_util.h Wed May 16 18:47:09 2007 +0100
4.3 @@ -42,8 +42,6 @@
4.4 GString *gmyth_util_time_to_isoformat(time_t time_value);
4.5 GString *gmyth_util_time_to_string (time_t time_value);
4.6 time_t gmyth_util_string_to_time (GString* time_str);
4.7 -gint64 gmyth_util_decode_long_long (GMythStringList *strlist,
4.8 - guint offset);
4.9
4.10 gchar* gmyth_util_time_to_isoformat_from_time_val_fmt ( const gchar *fmt_string, const GTimeVal* time_val );
4.11