d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Attempt to fix 64-bitness error in ashow. Deprecate the structure format macros in h/out.h because they make no sense on 64-bit platforms.

Browse source
This commit is contained in:
David Given 2013-05-29 14:48:51 +01:00
parent e0c121d6e6
commit 6fff2d45fe
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
h/out.h
View file

@ -100,13 +100,19 @@ struct outname {
/* /*
* structure format strings * structure format strings
*/ */
#if 0
/* The following strings only make sense on 32-bit platforms, so we're going
* to try and deprecate them. */
#define SF_HEAD "22222244" #define SF_HEAD "22222244"
#define SF_SECT "44444" #define SF_SECT "44444"
#define SF_RELO "1124" #define SF_RELO "1124"
#define SF_NAME "4224" #define SF_NAME "4224"
#endif
/* /*
* structure sizes (bytes in file; add digits in SF_*) * structure sizes on disk (bytes in file; add digits in SF_*)
* Note! These are NOT the sizes in memory (64-bit architectures will have
* a different layout).
*/ */
#define SZ_HEAD 20 #define SZ_HEAD 20
#define SZ_SECT 20 #define SZ_SECT 20

2
util/amisc/ashow.c
View file

@ -70,7 +70,7 @@ show(headp)
/* /*
* We get all struct outname's and the strings in core first. * We get all struct outname's and the strings in core first.
*/ */
name = (struct outname *) myalloc(headp->oh_nname * SZ_NAME); name = (struct outname *) myalloc(headp->oh_nname * sizeof(struct outname));
string = myalloc((unsigned) headp->oh_nchar); string = myalloc((unsigned) headp->oh_nchar);
rd_name(name, headp->oh_nname); rd_name(name, headp->oh_nname);
for (np = &name[0]; np < &name[headp->oh_nname]; np++) { for (np = &name[0]; np < &name[headp->oh_nname]; np++) {