summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/input_cache.c4
-rw-r--r--src/xine-engine/load_plugins.c10
-rw-r--r--src/xine-engine/osd.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index deec873d8..0b61c6c44 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -22,7 +22,7 @@
* The goal of this input plugin is to reduce
* the number of calls to the real input plugin.
*
- * $Id: input_cache.c,v 1.8 2005/10/14 21:02:16 miguelfreitas Exp $
+ * $Id: input_cache.c,v 1.9 2005/11/28 12:25:21 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -258,7 +258,7 @@ static off_t cache_plugin_seek_time(input_plugin_t *this_gen, int time_offset, i
cache_input_plugin_t *this = (cache_input_plugin_t *)this_gen;
off_t cur_pos;
- lprintf("time_offset: %ld, origin: %d\n", time_offset, origin);
+ lprintf("time_offset: %d, origin: %d\n", time_offset, origin);
this->seek_call++;
cur_pos = this->main_input_plugin->seek_time(this->main_input_plugin, time_offset, origin);
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 24f51af45..f7f243938 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: load_plugins.c,v 1.216 2005/09/19 16:14:02 valtri Exp $
+ * $Id: load_plugins.c,v 1.217 2005/11/28 12:25:21 valtri Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -794,8 +794,8 @@ static void save_plugin_list(FILE *fp, xine_list_t *plugins) {
file = node->file;
fprintf(fp, "[%s]\n", file->filename );
- fprintf(fp, "size=%llu\n", (uint64_t) file->filesize );
- fprintf(fp, "mtime=%llu\n", (uint64_t) file->filemtime );
+ fprintf(fp, "size=%" PRId64 "\n", (uint64_t) file->filesize );
+ fprintf(fp, "mtime=%" PRId64 "\n", (uint64_t) file->filemtime );
fprintf(fp, "type=%d\n", node->info->type );
fprintf(fp, "api=%d\n", node->info->API );
fprintf(fp, "id=%s\n", node->info->id );
@@ -913,10 +913,10 @@ static void load_plugin_list(FILE *fp, xine_list_t *plugins) {
}
} else if (node) {
if( !strcmp("size",line) ) {
- sscanf(value," %llu",&llu);
+ sscanf(value," %" SCNu64,&llu);
file->filesize = (off_t) llu;
} else if( !strcmp("mtime",line) ) {
- sscanf(value," %llu",&llu);
+ sscanf(value," %" SCNu64,&llu);
file->filemtime = (time_t) llu;
} else if( !strcmp("type",line) ) {
sscanf(value," %d",&i);
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index e1c47d198..505401ae2 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -967,7 +967,7 @@ static int osd_set_encoding (osd_object_t *osd, const char *encoding) {
_("osd: can't find out current locale character set\n"));
return 0;
}
- lprintf("locale encoding='%s'\n", osd, enc);
+ lprintf("locale encoding='%s'\n", enc);
} else
enc = strdup(encoding);