Module Name: src
Committed By: gutteridge
Date: Sun Nov 3 03:11:24 UTC 2024
Modified Files:
src/sys/arch/powerpc/stand/mkbootimage: mkbootimage.c
Log Message:
mkbootimage.c: consistently use sa_htobe32(2)
There were 38 calls to sa_htobe32(2) and two to htonl(3), mixed even
within the same function, with arpa/inet.h not included. (It's unclear
why this varied, as the original version of this file first checked in
included this discrepancy.)
Addresses build failure issue on current Linux distros that have a GCC
with implicit-function-declaration baked in as an error. Build tested
on Fedora 40.
Issue reported by Jan-Benedict Glaw. Also relevant to PR lib/58674.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
diff -u src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.20 src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.21
--- src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.20 Thu Feb 8 17:57:54 2024
+++ src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c Sun Nov 3 03:11:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkbootimage.c,v 1.20 2024/02/08 17:57:54 christos Exp $ */
+/* $NetBSD: mkbootimage.c,v 1.21 2024/11/03 03:11:24 gutteridge Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -577,11 +577,11 @@ rs6000_build_image(char *kernel, char *b
printf("writing records\n");
memcpy(swapped, &bootrec, sizeof(rs6000_boot_record_t));
for (i=0; i < 128; i++)
- swapped[i] = htonl(swapped[i]);
+ swapped[i] = sa_htobe32(swapped[i]);
write(rs6000_fd, swapped, sizeof(rs6000_boot_record_t));
memcpy(swapped, &confrec, sizeof(rs6000_config_record_t));
for (i=0; i < 128; i++)
- swapped[i] = htonl(swapped[i]);
+ swapped[i] = sa_htobe32(swapped[i]);
write(rs6000_fd, swapped, sizeof(rs6000_config_record_t));
free(kern_img);
