summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/askloc.c1
-rw-r--r--src/common.c4
-rw-r--r--src/dir.c2
-rw-r--r--src/dirn.c1
-rw-r--r--src/dirpart.c3
-rw-r--r--src/diskacc.c3
-rw-r--r--src/diskcapa.c5
-rw-r--r--src/edit.c3
-rw-r--r--src/ext2_sb.c3
-rw-r--r--src/ext2p.c3
-rw-r--r--src/fatn.c1
-rw-r--r--src/file_found.c4
-rw-r--r--src/filegen.h8
-rw-r--r--src/geometry.c3
-rw-r--r--src/hiddenn.c3
-rw-r--r--src/intrface.c3
-rw-r--r--src/nodisk.c1
-rw-r--r--src/partgptn.c1
-rw-r--r--src/parti386n.c1
-rw-r--r--src/partmacn.c1
-rw-r--r--src/partsunn.c1
-rw-r--r--src/partxboxn.c1
-rw-r--r--src/pbanner.c1
-rw-r--r--src/pblocksize.c3
-rw-r--r--src/pdisksel.c4
-rw-r--r--src/pfree_whole.c4
-rw-r--r--src/phbf.c4
-rw-r--r--src/phbs.c4
-rw-r--r--src/phmain.c4
-rw-r--r--src/phnc.c1
-rw-r--r--src/phrecn.c4
-rw-r--r--src/ppartsel.c3
-rw-r--r--src/tbanner.c1
-rw-r--r--src/tdelete.c3
-rw-r--r--src/tdiskop.c3
-rw-r--r--src/tdisksel.c3
-rw-r--r--src/testdisk.c4
-rw-r--r--src/tload.c3
-rw-r--r--src/tlog.c3
-rw-r--r--src/tmbrcode.c3
-rw-r--r--src/toptions.c3
-rw-r--r--src/tpartwr.c3
42 files changed, 59 insertions, 58 deletions
diff --git a/src/askloc.c b/src/askloc.c
index 7f2f945..c2a3aa8 100644
--- a/src/askloc.c
+++ b/src/askloc.c
@@ -24,6 +24,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/common.c b/src/common.c
index f91b08a..011560a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -32,8 +32,6 @@
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
-#include "types.h"
-#include "common.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -42,6 +40,8 @@
#include <io.h>
#endif
#endif
+#include "types.h"
+#include "common.h"
#include "log.h"
static unsigned int up2power_aux(const unsigned int number);
diff --git a/src/dir.c b/src/dir.c
index a9ec4a9..7fc3244 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -44,7 +45,6 @@
#include <io.h>
#endif
#include "common.h"
-#include <stdio.h>
#include "dir.h"
#include "log.h"
#include "log_part.h"
diff --git a/src/dirn.c b/src/dirn.c
index 34a254f..7af8293 100644
--- a/src/dirn.c
+++ b/src/dirn.c
@@ -24,6 +24,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
diff --git a/src/dirpart.c b/src/dirpart.c
index 01e1a67..a17f25d 100644
--- a/src/dirpart.c
+++ b/src/dirpart.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -32,8 +33,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "dir.h"
#include "dirn.h"
diff --git a/src/diskacc.c b/src/diskacc.c
index 02b4f47..d145086 100644
--- a/src/diskacc.c
+++ b/src/diskacc.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -31,8 +32,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "diskacc.h"
diff --git a/src/diskcapa.c b/src/diskcapa.c
index 9f8fc8f..57264af 100644
--- a/src/diskcapa.c
+++ b/src/diskcapa.c
@@ -22,14 +22,13 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
+
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "diskcapa.h"
diff --git a/src/edit.c b/src/edit.c
index 6dfcc77..0174baf 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -36,8 +37,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "fnctdsk.h"
#include "edit.h"
diff --git a/src/ext2_sb.c b/src/ext2_sb.c
index 5edf475..d1f6585 100644
--- a/src/ext2_sb.c
+++ b/src/ext2_sb.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -32,8 +33,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "guid_cmp.h"
diff --git a/src/ext2p.c b/src/ext2p.c
index eab28f7..80fe951 100644
--- a/src/ext2p.c
+++ b/src/ext2p.c
@@ -26,6 +26,9 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
#include "types.h"
#include "common.h"
#include "list.h"
diff --git a/src/fatn.c b/src/fatn.c
index 60662de..c139a03 100644
--- a/src/fatn.c
+++ b/src/fatn.c
@@ -25,6 +25,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
diff --git a/src/file_found.c b/src/file_found.c
index 2478baa..72964b3 100644
--- a/src/file_found.c
+++ b/src/file_found.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -34,8 +36,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "dir.h"
#include "list.h"
diff --git a/src/filegen.h b/src/filegen.h
index ef0c4f9..1d14b2a 100644
--- a/src/filegen.h
+++ b/src/filegen.h
@@ -48,8 +48,8 @@ typedef struct
struct file_enable_struct
{
- unsigned int enable;
const file_hint_t *file_hint;
+ unsigned int enable;
};
struct file_stat_struct
@@ -61,14 +61,14 @@ struct file_stat_struct
struct file_recovery_struct
{
+ char filename[2048];
+ alloc_list_t location;
+ alloc_data_t *loc;
file_stat_t *file_stat;
FILE *handle;
- char filename[2048];
time_t time;
uint64_t file_size;
uint64_t file_size_on_disk;
- alloc_list_t location;
- alloc_data_t *loc;
const char *extension;
uint64_t min_filesize;
uint64_t offset_error;
diff --git a/src/geometry.c b/src/geometry.c
index 4900729..411c521 100644
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -34,8 +35,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "hdaccess.h"
diff --git a/src/hiddenn.c b/src/hiddenn.c
index 6a3e930..0ea1f7d 100644
--- a/src/hiddenn.c
+++ b/src/hiddenn.c
@@ -23,7 +23,8 @@
#include <config.h>
#endif
#ifdef HAVE_NCURSES
-
+
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
diff --git a/src/intrface.c b/src/intrface.c
index 5fe85b5..964f30d 100644
--- a/src/intrface.c
+++ b/src/intrface.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -32,8 +33,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "godmode.h"
#include "fnctdsk.h"
diff --git a/src/nodisk.c b/src/nodisk.c
index 47d0a38..0d10f48 100644
--- a/src/nodisk.c
+++ b/src/nodisk.c
@@ -24,6 +24,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/src/partgptn.c b/src/partgptn.c
index 194d20e..7cc5cef 100644
--- a/src/partgptn.c
+++ b/src/partgptn.c
@@ -26,6 +26,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/parti386n.c b/src/parti386n.c
index b69df00..8e4d5a6 100644
--- a/src/parti386n.c
+++ b/src/parti386n.c
@@ -26,6 +26,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/partmacn.c b/src/partmacn.c
index ebd79c8..4419599 100644
--- a/src/partmacn.c
+++ b/src/partmacn.c
@@ -26,6 +26,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/partsunn.c b/src/partsunn.c
index 1537d47..c74c743 100644
--- a/src/partsunn.c
+++ b/src/partsunn.c
@@ -26,6 +26,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/partxboxn.c b/src/partxboxn.c
index d76b881..6bf433f 100644
--- a/src/partxboxn.c
+++ b/src/partxboxn.c
@@ -26,6 +26,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/pbanner.c b/src/pbanner.c
index 500b16c..f0b90da 100644
--- a/src/pbanner.c
+++ b/src/pbanner.c
@@ -24,6 +24,7 @@
#include <config.h>
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
diff --git a/src/pblocksize.c b/src/pblocksize.c
index 9c9a4af..42f98a2 100644
--- a/src/pblocksize.c
+++ b/src/pblocksize.c
@@ -24,13 +24,12 @@
#include <config.h>
#endif
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "pblocksize.h"
diff --git a/src/pdisksel.c b/src/pdisksel.c
index 8c5a2a2..5483054 100644
--- a/src/pdisksel.c
+++ b/src/pdisksel.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -37,8 +39,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "dir.h"
#include "list.h"
diff --git a/src/pfree_whole.c b/src/pfree_whole.c
index cb22e0e..bf2df8f 100644
--- a/src/pfree_whole.c
+++ b/src/pfree_whole.c
@@ -23,13 +23,13 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "pfree_whole.h"
diff --git a/src/phbf.c b/src/phbf.c
index be35261..93d13af 100644
--- a/src/phbf.c
+++ b/src/phbf.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -40,8 +42,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include <errno.h>
#ifdef HAVE_WINDEF_H
diff --git a/src/phbs.c b/src/phbs.c
index 9cea318..63e7b33 100644
--- a/src/phbs.c
+++ b/src/phbs.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -44,8 +46,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include <errno.h>
#ifdef HAVE_WINDEF_H
diff --git a/src/phmain.c b/src/phmain.c
index 8c9544c..ce1c277 100644
--- a/src/phmain.c
+++ b/src/phmain.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -59,8 +61,6 @@
#include "fnctdsk.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#ifdef HAVE_JPEGLIB_H
#include <jpeglib.h>
diff --git a/src/phnc.c b/src/phnc.c
index 93cf632..7fcd32e 100644
--- a/src/phnc.c
+++ b/src/phnc.c
@@ -25,6 +25,7 @@
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
diff --git a/src/phrecn.c b/src/phrecn.c
index 194a187..2c3f5e3 100644
--- a/src/phrecn.c
+++ b/src/phrecn.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -44,8 +46,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include <errno.h>
#ifdef HAVE_WINDEF_H
diff --git a/src/ppartsel.c b/src/ppartsel.c
index 5f43335..914d365 100644
--- a/src/ppartsel.c
+++ b/src/ppartsel.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -33,7 +35,6 @@
#include "types.h"
#include "common.h"
#include "intrf.h"
-#include <stdio.h>
#include "fnctdsk.h"
#include "dir.h"
#include "list.h"
diff --git a/src/tbanner.c b/src/tbanner.c
index a49c310..04596e8 100644
--- a/src/tbanner.c
+++ b/src/tbanner.c
@@ -24,6 +24,7 @@
#include <config.h>
#endif
#ifdef HAVE_NCURSES
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
diff --git a/src/tdelete.c b/src/tdelete.c
index 26d99f2..e074c12 100644
--- a/src/tdelete.c
+++ b/src/tdelete.c
@@ -23,14 +23,13 @@
#include <config.h>
#endif
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "lang.h"
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "tdelete.h"
diff --git a/src/tdiskop.c b/src/tdiskop.c
index 23e6fcf..bbdea14 100644
--- a/src/tdiskop.c
+++ b/src/tdiskop.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -31,8 +32,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "godmode.h"
#include "fnctdsk.h"
diff --git a/src/tdisksel.c b/src/tdisksel.c
index 40755de..6fd225b 100644
--- a/src/tdisksel.c
+++ b/src/tdisksel.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -34,8 +35,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "partauto.h"
#include "log.h"
diff --git a/src/testdisk.c b/src/testdisk.c
index bde56a2..23335c5 100644
--- a/src/testdisk.c
+++ b/src/testdisk.c
@@ -23,6 +23,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -43,8 +45,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/src/tload.c b/src/tload.c
index 310d093..0b196e2 100644
--- a/src/tload.c
+++ b/src/tload.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -40,8 +41,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "fnctdsk.h"
#include "savehdr.h"
diff --git a/src/tlog.c b/src/tlog.c
index f283a36..6d6990a 100644
--- a/src/tlog.c
+++ b/src/tlog.c
@@ -23,13 +23,12 @@
#include <config.h>
#endif
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "tlog.h"
diff --git a/src/tmbrcode.c b/src/tmbrcode.c
index 81685a1..e7e4c10 100644
--- a/src/tmbrcode.c
+++ b/src/tmbrcode.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -32,8 +33,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "tmbrcode.h"
diff --git a/src/toptions.c b/src/toptions.c
index 70af73e..00de51f 100644
--- a/src/toptions.c
+++ b/src/toptions.c
@@ -23,13 +23,12 @@
#include <config.h>
#endif
+#include <stdio.h>
#include "types.h"
#include "common.h"
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "toptions.h"
diff --git a/src/tpartwr.c b/src/tpartwr.c
index 95b882a..3d41d33 100644
--- a/src/tpartwr.c
+++ b/src/tpartwr.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -32,8 +33,6 @@
#include "intrf.h"
#ifdef HAVE_NCURSES
#include "intrfn.h"
-#else
-#include <stdio.h>
#endif
#include "log.h"
#include "tpartwr.h"