summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-02-22 12:19:12 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-02-22 12:19:12 +0000
commit22b7701fe75cce9afdbc27046821dc089f9e7dac (patch)
treeca5b4f0428fad0fc9c775dfb0ac879ddee863846 /apps/plugins
parent376057d2b67bae0a7b24ae1715d3cbb0b540b7a9 (diff)
downloadrockbox-22b7701fe75cce9afdbc27046821dc089f9e7dac.zip
rockbox-22b7701fe75cce9afdbc27046821dc089f9e7dac.tar.gz
rockbox-22b7701fe75cce9afdbc27046821dc089f9e7dac.tar.bz2
rockbox-22b7701fe75cce9afdbc27046821dc089f9e7dac.tar.xz
Build cleanup and general fixes. fprintf() is now fdprintf(), the separation
between uisimulator files and firmware/apps files are better done. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6031 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/Makefile6
-rw-r--r--apps/plugins/calendar.c14
-rw-r--r--apps/plugins/lib/configfile.c8
3 files changed, 17 insertions, 11 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile
index 9549959..ef506a9 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -71,7 +71,13 @@ $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(APPSDIR)/plugin.h
@echo "DLL $@"
@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(OBJDIR)/libplugin.a -o $@
+ifeq ($(UNAME),CYGWIN)
+# 'x' must be kept or you'll have "Win32 error 5"
+# $ fgrep 5 /usr/include/w32api/winerror.h | head -1
+# #define ERROR_ACCESS_DENIED 5L
+else
@chmod -x $@
+endif
endif # end of win32-simulator
endif # end of simulator section
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 44b3685..8627c9a 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -325,13 +325,13 @@ static bool save_memo(int changed, bool new_mod, struct shown *shown)
}
if (new_mod)
{
- rb->fprintf(fq, "%02d%02d%04d%01d%01d%s\n",
- memos[changed].day,
- memos[changed].month,
- memos[changed].year,
- memos[changed].wday,
- memos[changed].type,
- memos[changed].message);
+ rb->fdprintf(fq, "%02d%02d%04d%01d%01d%s\n",
+ memos[changed].day,
+ memos[changed].month,
+ memos[changed].year,
+ memos[changed].wday,
+ memos[changed].type,
+ memos[changed].message);
}
rb->lseek(fp, memos[changed].file_pointer_end, SEEK_SET);
for (i = memos[changed].file_pointer_end;
diff --git a/apps/plugins/lib/configfile.c b/apps/plugins/lib/configfile.c
index ff4809a..f2f0a39 100644
--- a/apps/plugins/lib/configfile.c
+++ b/apps/plugins/lib/configfile.c
@@ -38,24 +38,24 @@ int configfile_save(const char *filename, struct configdata *cfg,
if(fd < 0)
return fd*10 - 1;
- cfg_rb->fprintf(fd, "file version: %d\n", version);
+ cfg_rb->fdprintf(fd, "file version: %d\n", version);
for(i = 0;i < num_items;i++) {
switch(cfg[i].type) {
case TYPE_INT:
- cfg_rb->fprintf(fd, "%s: %d\n",
+ cfg_rb->fdprintf(fd, "%s: %d\n",
cfg[i].name,
*cfg[i].val);
break;
case TYPE_ENUM:
- cfg_rb->fprintf(fd, "%s: %s\n",
+ cfg_rb->fdprintf(fd, "%s: %s\n",
cfg[i].name,
cfg[i].values[*cfg[i].val]);
break;
case TYPE_STRING:
- cfg_rb->fprintf(fd, "%s: %s\n",
+ cfg_rb->fdprintf(fd, "%s: %s\n",
cfg[i].name,
cfg[i].string);
break;