Fix printf warnings and add a few casts.

PR:		7560
Submitted by:	Stefan Eggers <seggers@semyam.dinoco.de>
This commit is contained in:
Jordan K. Hubbard 1998-09-14 19:14:11 +00:00
parent 344e4a2733
commit 04f80d35bf
6 changed files with 18 additions and 18 deletions

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: disks.c,v 1.97 1998/03/23 05:59:10 jkh Exp $
* $Id: disks.c,v 1.98 1998/03/23 08:36:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -309,7 +309,7 @@ diskPartition(Device *dev)
int size, subtype;
chunk_e partitiontype;
snprintf(tmp, 20, "%d", chunk_info[current_chunk]->size);
snprintf(tmp, 20, "%lu", chunk_info[current_chunk]->size);
val = msgGetInput(tmp, "Please specify the size for new FreeBSD slice in blocks\n"
"or append a trailing `M' for megabytes (e.g. 20M).");
if (val && (size = strtol(val, &cp, 0)) > 0) {

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: uc_eisa.c,v 1.4 1997/02/22 14:12:26 peter Exp $
*/
#include <sys/types.h>
@ -142,7 +142,7 @@ eisa_fill_in(struct kernel *kp, struct uc_eisa *epc, struct eisa_device_node *ed
sizeof(struct eisa_driver));
n=(char *)kv_to_u(kp, (u_int)edrv->name, 20);
asprintf(&epc->device, "%s%d", n, edn->dev.unit);
asprintf(&epc->device, "%s%lu", n, edn->dev.unit);
free(n);
n=(char *)kv_to_u(kp, (u_int)edn->dev.full_name, 40); /*XXX*/

View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id$
* $Id: ufs.c,v 1.12 1997/02/22 14:12:35 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -49,15 +49,15 @@ mediaGetUFS(Device *dev, char *file, Boolean probe)
if (isDebug())
msgDebug("Request for %s from UFS\n", file);
snprintf(buf, PATH_MAX, "%s/%s", dev->private, file);
snprintf(buf, PATH_MAX, "%s/%s", (char *)dev->private, file);
if (file_readable(buf))
return fopen(buf, "r");
snprintf(buf, PATH_MAX, "%s/dists/%s", dev->private, file);
snprintf(buf, PATH_MAX, "%s/dists/%s", (char *)dev->private, file);
if (file_readable(buf))
return fopen(buf, "r");
snprintf(buf, PATH_MAX, "%s/%s/%s", dev->private, variable_get(VAR_RELNAME), file);
snprintf(buf, PATH_MAX, "%s/%s/%s", (char *)dev->private, variable_get(VAR_RELNAME), file);
if (file_readable(buf))
return fopen(buf, "r");
snprintf(buf, PATH_MAX, "%s/%s/dists/%s", dev->private, variable_get(VAR_RELNAME), file);
snprintf(buf, PATH_MAX, "%s/%s/dists/%s", (char *)dev->private, variable_get(VAR_RELNAME), file);
return fopen(buf, "r");
}

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: disks.c,v 1.97 1998/03/23 05:59:10 jkh Exp $
* $Id: disks.c,v 1.98 1998/03/23 08:36:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -309,7 +309,7 @@ diskPartition(Device *dev)
int size, subtype;
chunk_e partitiontype;
snprintf(tmp, 20, "%d", chunk_info[current_chunk]->size);
snprintf(tmp, 20, "%lu", chunk_info[current_chunk]->size);
val = msgGetInput(tmp, "Please specify the size for new FreeBSD slice in blocks\n"
"or append a trailing `M' for megabytes (e.g. 20M).");
if (val && (size = strtol(val, &cp, 0)) > 0) {

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: disks.c,v 1.97 1998/03/23 05:59:10 jkh Exp $
* $Id: disks.c,v 1.98 1998/03/23 08:36:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -309,7 +309,7 @@ diskPartition(Device *dev)
int size, subtype;
chunk_e partitiontype;
snprintf(tmp, 20, "%d", chunk_info[current_chunk]->size);
snprintf(tmp, 20, "%lu", chunk_info[current_chunk]->size);
val = msgGetInput(tmp, "Please specify the size for new FreeBSD slice in blocks\n"
"or append a trailing `M' for megabytes (e.g. 20M).");
if (val && (size = strtol(val, &cp, 0)) > 0) {

View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id$
* $Id: ufs.c,v 1.12 1997/02/22 14:12:35 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -49,15 +49,15 @@ mediaGetUFS(Device *dev, char *file, Boolean probe)
if (isDebug())
msgDebug("Request for %s from UFS\n", file);
snprintf(buf, PATH_MAX, "%s/%s", dev->private, file);
snprintf(buf, PATH_MAX, "%s/%s", (char *)dev->private, file);
if (file_readable(buf))
return fopen(buf, "r");
snprintf(buf, PATH_MAX, "%s/dists/%s", dev->private, file);
snprintf(buf, PATH_MAX, "%s/dists/%s", (char *)dev->private, file);
if (file_readable(buf))
return fopen(buf, "r");
snprintf(buf, PATH_MAX, "%s/%s/%s", dev->private, variable_get(VAR_RELNAME), file);
snprintf(buf, PATH_MAX, "%s/%s/%s", (char *)dev->private, variable_get(VAR_RELNAME), file);
if (file_readable(buf))
return fopen(buf, "r");
snprintf(buf, PATH_MAX, "%s/%s/dists/%s", dev->private, variable_get(VAR_RELNAME), file);
snprintf(buf, PATH_MAX, "%s/%s/dists/%s", (char *)dev->private, variable_get(VAR_RELNAME), file);
return fopen(buf, "r");
}