chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "tree-wide: Always use recvmsg with MSG_CMSG_CLOEXEC"
[elogind.git]
/
src
/
fsck
/
fsck.c
diff --git
a/src/fsck/fsck.c
b/src/fsck/fsck.c
index a7226ce4df7e98a93e19f9e4d4cb2bac689ce63c..78ceeb6fab384e4bdbc3b234c866060a1383d041 100644
(file)
--- a/
src/fsck/fsck.c
+++ b/
src/fsck/fsck.c
@@
-35,7
+35,7
@@
#include "special.h"
#include "bus-util.h"
#include "bus-error.h"
#include "special.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "bus-errors.h"
+#include "bus-
common-
errors.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
#include "fileio.h"
#include "udev-util.h"
#include "path-util.h"
@@
-222,7
+222,7
@@
int main(int argc, char *argv[]) {
const char *device, *type;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
const char *device, *type;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
- char dash_c[
2+10+
1];
+ char dash_c[
sizeof("-C")-1 + DECIMAL_STR_MAX(int) +
1];
struct stat st;
if (argc > 2) {
struct stat st;
if (argc > 2) {
@@
-336,8
+336,7
@@
int main(int argc, char *argv[]) {
cmdline[i++] = "-f";
if (progress_pipe[1] >= 0) {
cmdline[i++] = "-f";
if (progress_pipe[1] >= 0) {
- snprintf(dash_c, sizeof(dash_c), "-C%i", progress_pipe[1]);
- char_array_0(dash_c);
+ xsprintf(dash_c, "-C%i", progress_pipe[1]);
cmdline[i++] = dash_c;
}
cmdline[i++] = dash_c;
}