[tracker/wip/extract-graphs: 12/30] libtracker-extract: Fixed some small coding style issues
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/extract-graphs: 12/30] libtracker-extract: Fixed some small coding style issues
- Date: Tue, 6 Sep 2011 10:52:08 +0000 (UTC)
commit 25423cce155adee6ba93e5d7af975c993b4b5113
Author: Martyn Russell <martyn lanedo com>
Date: Mon Sep 5 15:06:17 2011 +0100
libtracker-extract: Fixed some small coding style issues
src/libtracker-extract/tracker-extract-client.h | 6 ++--
src/libtracker-extract/tracker-extract-info.h | 40 ++++++++++------------
src/tracker-extract/tracker-extract-playlist.c | 16 ++++++---
src/tracker-extract/tracker-extract-text.c | 8 ++--
4 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-extract-client.h b/src/libtracker-extract/tracker-extract-client.h
index 4290c13..b5b6270 100644
--- a/src/libtracker-extract/tracker-extract-client.h
+++ b/src/libtracker-extract/tracker-extract-client.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_EXTRACT_CLIENT_H__
-#define __TRACKER_EXTRACT_CLIENT_H__
+#ifndef __LIBTRACKER_EXTRACT_CLIENT_H__
+#define __LIBTRACKER_EXTRACT_CLIENT_H__
#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-extract/tracker-extract.h> must be included directly."
@@ -44,4 +44,4 @@ void tracker_extract_client_cancel_for_prefix (GFile
G_END_DECLS
-#endif /* __TRACKER_EXTRACT_CLIENT_H__ */
+#endif /* __LIBTRACKER_EXTRACT_CLIENT_H__ */
diff --git a/src/libtracker-extract/tracker-extract-info.h b/src/libtracker-extract/tracker-extract-info.h
index f2da427..beff56a 100644
--- a/src/libtracker-extract/tracker-extract-info.h
+++ b/src/libtracker-extract/tracker-extract-info.h
@@ -19,8 +19,8 @@
* Author: Carlos Garnacho <carlos lanedo com>
*/
-#ifndef __TRACKER_EXTRACT_INFO_H__
-#define __TRACKER_EXTRACT_INFO_H__
+#ifndef __LIBTRACKER_EXTRACT_INFO_H__
+#define __LIBTRACKER_EXTRACT_INFO_H__
#if !defined (__LIBTRACKER_EXTRACT_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-extract/tracker-extract.h> must be included directly."
@@ -33,26 +33,22 @@ G_BEGIN_DECLS
typedef struct _TrackerExtractInfo TrackerExtractInfo;
-GType tracker_extract_info_get_type (void) G_GNUC_CONST;
-
-TrackerExtractInfo * tracker_extract_info_new (GFile *file,
- const gchar *mimetype,
- const gchar *graph);
-
-TrackerExtractInfo * tracker_extract_info_ref (TrackerExtractInfo *info);
-void tracker_extract_info_unref (TrackerExtractInfo *info);
-
-GFile * tracker_extract_info_get_file (TrackerExtractInfo *info);
-const gchar * tracker_extract_info_get_mimetype (TrackerExtractInfo *info);
-const gchar * tracker_extract_info_get_graph (TrackerExtractInfo *info);
-
-TrackerSparqlBuilder * tracker_extract_info_get_preupdate_builder (TrackerExtractInfo *info);
-TrackerSparqlBuilder * tracker_extract_info_get_metadata_builder (TrackerExtractInfo *info);
-
-const gchar * tracker_extract_info_get_where_clause (TrackerExtractInfo *info);
-void tracker_extract_info_set_where_clause (TrackerExtractInfo *info,
- const gchar *where);
+GType tracker_extract_info_get_type (void) G_GNUC_CONST;
+
+TrackerExtractInfo * tracker_extract_info_new (GFile *file,
+ const gchar *mimetype,
+ const gchar *graph);
+TrackerExtractInfo * tracker_extract_info_ref (TrackerExtractInfo *info);
+void tracker_extract_info_unref (TrackerExtractInfo *info);
+GFile * tracker_extract_info_get_file (TrackerExtractInfo *info);
+const gchar * tracker_extract_info_get_mimetype (TrackerExtractInfo *info);
+const gchar * tracker_extract_info_get_graph (TrackerExtractInfo *info);
+TrackerSparqlBuilder *tracker_extract_info_get_preupdate_builder (TrackerExtractInfo *info);
+TrackerSparqlBuilder *tracker_extract_info_get_metadata_builder (TrackerExtractInfo *info);
+const gchar * tracker_extract_info_get_where_clause (TrackerExtractInfo *info);
+void tracker_extract_info_set_where_clause (TrackerExtractInfo *info,
+ const gchar *where);
G_END_DECLS
-#endif /* __TRACKER_EXTRACT_INFO_H__ */
+#endif /* __LIBTRACKER_EXTRACT_INFO_H__ */
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index 83db6e8..e3d117d 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -52,12 +52,15 @@ typedef struct {
} PlaylistMetadata;
static void
-entry_parsed (TotemPlParser *parser, const gchar *to_uri, GHashTable *to_metadata, gpointer user_data)
+entry_parsed (TotemPlParser *parser,
+ const gchar *to_uri,
+ GHashTable *to_metadata,
+ gpointer user_data)
{
gchar *duration;
PlaylistMetadata *data;
- data = (PlaylistMetadata *)user_data;
+ data = (PlaylistMetadata *) user_data;
data->track_counter++;
if (data->track_counter > 1000) {
@@ -90,6 +93,7 @@ entry_parsed (TotemPlParser *parser, const gchar *to_uri, GHashTable *to_metadat
if (duration != NULL) {
gint64 secs = totem_pl_parser_parse_duration (duration, FALSE);
+
if (secs > 0) {
data->total_time += secs;
}
@@ -99,12 +103,12 @@ entry_parsed (TotemPlParser *parser, const gchar *to_uri, GHashTable *to_metadat
G_MODULE_EXPORT gboolean
tracker_extract_get_metadata (TrackerExtractInfo *info)
{
- TotemPlParser *pl;
+ TotemPlParser *pl;
TotemPlParserResult result;
TrackerSparqlBuilder *metadata = tracker_extract_info_get_metadata_builder (info);
- PlaylistMetadata data = { 0, 0, metadata };
- GFile *file;
- gchar *uri;
+ PlaylistMetadata data = { 0, 0, metadata };
+ GFile *file;
+ gchar *uri;
pl = totem_pl_parser_new ();
file = tracker_extract_info_get_file (info);
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index db61e34..4ae1e27 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -29,15 +29,15 @@
#include "tracker-main.h"
#include "tracker-read.h"
-#define TRY_LOCALE_TO_UTF8_CONVERSION 0
+#define TRY_LOCALE_TO_UTF8_CONVERSION 0
static gchar *
get_file_content (GFile *file,
gsize n_bytes)
{
- GFileInputStream *stream;
- GError *error = NULL;
- gchar *text, *uri;
+ GFileInputStream *stream;
+ GError *error = NULL;
+ gchar *text, *uri;
/* If no content requested, return */
if (n_bytes == 0) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]