Merge remote-tracking branch 'uncool/cst-next'

Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
122 changed files with 5543 additions and 2589 deletions

View File

@@ -31,6 +31,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <inttypes.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -284,7 +285,7 @@ int check_dir(const char * dir, bool allow_tmp)
ret = 0; // ok
}
if(ret == -1)
printf("Wrong Filessystem Type: 0x%x\n",s.f_type);
printf("Wrong Filessystem Type: 0x%" PRIx32"\n",s.f_type);
}
return ret;
}