[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-585-g2c580c1
Tuxbox Sources
Brought to you by:
dbt1
|
From: GetAway <tux...@ne...> - 2015-06-01 19:26:59
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 2c580c15d234fec3f041e1343322cf8408d5a9fc (commit)
from 77bc28568f4c142acbe789c6dc85c7211672a55e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2c580c15d234fec3f041e1343322cf8408d5a9fc
Author: Stefan Seyfried <se...@tu...>
Date: Mon Jun 1 21:26:20 2015 +0200
netfile: making f_type const char *
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/src/driver/netfile.cpp b/tuxbox/neutrino/src/driver/netfile.cpp
index 9547dfd..5219024 100644
--- a/tuxbox/neutrino/src/driver/netfile.cpp
+++ b/tuxbox/neutrino/src/driver/netfile.cpp
@@ -202,7 +202,7 @@ static int base64_encode(char *dest, const char *src);
void getOpts()
{
- char *dirs[] = { "/var/etc", ".", NULL };
+ const char *dirs[] = { "/var/etc", ".", NULL };
char buf[4096], *ptr;
int i;
FILE *fd = NULL;
@@ -1084,7 +1084,7 @@ FILE *f_open(const char *filename, const char *acctype)
{
if (((*(uint32_t *)&(magic[0])) & *(uint32_t *)&(known_magic[i].mask[0])) == *(uint32_t *)&(known_magic[i].mode[0]))
{
- f_type(fd, (char *)known_magic[i].type);
+ f_type(fd, known_magic[i].type);
goto magic_found;
}
}
@@ -1260,7 +1260,7 @@ size_t f_read (void *ptr, size_t size, size_t nitems, FILE *stream)
return rval;
}
-char *f_type(FILE *stream, char *type)
+const char *f_type(FILE *stream, const char *type)
{
int i;
diff --git a/tuxbox/neutrino/src/driver/netfile.h b/tuxbox/neutrino/src/driver/netfile.h
index 97a89e1..5ea13bb 100644
--- a/tuxbox/neutrino/src/driver/netfile.h
+++ b/tuxbox/neutrino/src/driver/netfile.h
@@ -83,7 +83,7 @@ extern long f_tell(FILE *);
extern void f_rewind(FILE *);
extern int f_seek(FILE *, long, int);
extern int f_status(FILE *, void (*)(void*));
-extern char *f_type(FILE*, char*);
+extern const char *f_type(FILE*, const char*);
extern char err_txt[2048];
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/driver/netfile.cpp | 6 +++---
tuxbox/neutrino/src/driver/netfile.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
|