diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2013-07-16 13:07:58 +0200 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2013-07-16 13:07:58 +0200 |
| commit | b25e53c867d60914248623b626d1d98a1914d000 (patch) | |
| tree | 6a655812a8b3bdbb61351919b2d8487140ad6d19 /server | |
| parent | 329129d9c141a08a930e30b1f06e5d581c5858a2 (diff) | |
| download | vdr-plugin-streamdev-b25e53c867d60914248623b626d1d98a1914d000.tar.gz vdr-plugin-streamdev-b25e53c867d60914248623b626d1d98a1914d000.tar.bz2 | |
Fixed recordings menu inode numbers: ino_t is a long long on some systems
Diffstat (limited to 'server')
| -rw-r--r-- | server/connectionHTTP.c | 4 | ||||
| -rw-r--r-- | server/menuHTTP.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c index ec10824..c3b3f90 100644 --- a/server/connectionHTTP.c +++ b/server/connectionHTTP.c @@ -459,12 +459,12 @@ cRecording* cConnectionHTTP::RecordingFromString(const char *FileBase, const cha if (p != FileBase && l > 0L) { if (*p == ':') { // get recording by dev:inode - unsigned long inode = strtoul(p + 1, &p, 0); + ino_t inode = (ino_t) strtoull(p + 1, &p, 0); if (*p == 0 && inode > 0) { struct stat st; cThreadLock RecordingsLock(&Recordings); for (cRecording *rec = Recordings.First(); rec; rec = Recordings.Next(rec)) { - if (stat(rec->FileName(), &st) == 0 && st.st_dev == (dev_t) l && st.st_ino == (ino_t) inode) + if (stat(rec->FileName(), &st) == 0 && st.st_dev == (dev_t) l && st.st_ino == inode) return new cRecording(rec->FileName()); } } diff --git a/server/menuHTTP.c b/server/menuHTTP.c index de46f00..a66573e 100644 --- a/server/menuHTTP.c +++ b/server/menuHTTP.c @@ -28,7 +28,7 @@ const cString cRecordingsIterator::ItemRessource() const { struct stat st; if (stat(current->FileName(), &st) == 0) - return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); + return cString::sprintf("%lu:%llu.rec", (unsigned long) st.st_dev, (unsigned long long) st.st_ino); return ""; } |