summaryrefslogtreecommitdiffstats
path: root/sbin/restore
diff options
context:
space:
mode:
authormike <mike@FreeBSD.org>2002-09-25 04:06:37 +0000
committermike <mike@FreeBSD.org>2002-09-25 04:06:37 +0000
commit86a758e51be945d9e690ee0802a21bf9a667b4e8 (patch)
tree2295edf76df9065e84ea0b415c9c13ecf434f1fa /sbin/restore
parentb9155304da025f935d34f191093267f40e40cdd2 (diff)
downloadFreeBSD-src-86a758e51be945d9e690ee0802a21bf9a667b4e8.zip
FreeBSD-src-86a758e51be945d9e690ee0802a21bf9a667b4e8.tar.gz
Use the standardized CHAR_BIT constant instead of NBBY in userland.
Diffstat (limited to 'sbin/restore')
-rw-r--r--sbin/restore/dirs.c1
-rw-r--r--sbin/restore/interactive.c1
-rw-r--r--sbin/restore/main.c1
-rw-r--r--sbin/restore/restore.c1
-rw-r--r--sbin/restore/restore.h6
-rw-r--r--sbin/restore/symtab.c1
-rw-r--r--sbin/restore/tape.c1
-rw-r--r--sbin/restore/utilities.c1
8 files changed, 11 insertions, 2 deletions
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index dba5738..313b87b 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -55,6 +55,7 @@ static const char rcsid[] =
#include <err.h>
#include <errno.h>
+#include <limits.h>
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 5bfe821..ec49c36 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -48,6 +48,7 @@ static const char rcsid[] =
#include <setjmp.h>
#include <glob.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 2d316c0..e612436 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -52,6 +52,7 @@ static const char rcsid[] =
#include <protocols/dumprestore.h>
#include <err.h>
+#include <limits.h>
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 8b463a7..a9eb31e 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -41,6 +41,7 @@ static const char rcsid[] =
#include <sys/types.h>
+#include <limits.h>
#include <stdio.h>
#include <string.h>
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 8d7206d..d00c3b3 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -139,9 +139,11 @@ typedef struct rstdirdesc RST_DIR;
* Useful macros
*/
#define TSTINO(ino, map) \
- (map[(u_int)((ino) - 1) / NBBY] & (1 << ((u_int)((ino) - 1) % NBBY)))
+ (map[(u_int)((ino) - 1) / CHAR_BIT] & \
+ (1 << ((u_int)((ino) - 1) % CHAR_BIT)))
#define SETINO(ino, map) \
- map[(u_int)((ino) - 1) / NBBY] |= 1 << ((u_int)((ino) - 1) % NBBY)
+ map[(u_int)((ino) - 1) / CHAR_BIT] |= \
+ 1 << ((u_int)((ino) - 1) % CHAR_BIT)
#define dprintf if (dflag) fprintf
#define vprintf if (vflag) fprintf
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 3dd55f8..ffda3fc 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -55,6 +55,7 @@ static const char rcsid[] =
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 1392f59..70ff44a 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -54,6 +54,7 @@ static const char rcsid[] =
#include <protocols/dumprestore.h>
#include <errno.h>
+#include <limits.h>
#include <paths.h>
#include <setjmp.h>
#include <stdio.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 3901ad3..e42465d 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -46,6 +46,7 @@ static const char rcsid[] =
#include <ufs/ufs/dir.h>
#include <errno.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
OpenPOWER on IntegriCloud