Fix build with GCC 4.4. I think this is already fixed in the repository.
Le Thu, 11 Mar 2010 18:13:49 -0300,
Rajiv Andrade <[email protected]> a écrit :
>
> On Mar 2, 2010, at 12:55 PM, Laurent Bigonville wrote:
>
> >
> > There are currently 12 patches I'm not sure you want me to post
> > them on the mailing list.
> >
> Sorry for the delay, yes, it's ok.
>
> Thanks,
> Rajiv Andrade
>
Author: Milos Jakubicek <[email protected]>
Description: Fix FTBFS (Closes: #505602).
diff -Naurp trousers.orig/tools/ps_convert.c trousers/tools/ps_convert.c
--- trousers.orig/tools/ps_convert.c 2009-08-03 17:40:58.000000000 +0000
+++ trousers/tools/ps_convert.c 2009-08-15 18:38:19.000000000 +0000
@@ -136,13 +136,14 @@ int
version_0_convert(FILE *in, FILE *out)
{
int rc, members = 0;
- UINT32 i, u32 = *(UINT32 *)buf;
+ UINT32 i;
+ UINT32 *u32 = (UINT32 *) &buf;
/* output the PS version */
OUT(out, "\1", 1);
/* number of keys */
- OUT(out, &u32, sizeof(UINT32));
+ OUT(out, u32, sizeof(UINT32));
/* The +- 1's below account for the byte we read in to determine
* if the PS file had a version byte at the beginning */
@@ -163,7 +164,7 @@ version_0_convert(FILE *in, FILE *out)
return -1;
}
- for (i = 1; i < u32; i++) {
+ for (i = 1; i < *u32; i++) {
/* read in subsequent key's headers */
if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
1, in)) != 1) {
diff -Naurp trousers.orig/tools/ps_inspect.c trousers/tools/ps_inspect.c
--- trousers.orig/tools/ps_inspect.c 2009-08-15 18:29:06.000000000 +0000
+++ trousers/tools/ps_inspect.c 2009-08-15 18:38:19.000000000 +0000
@@ -185,10 +185,11 @@ int
version_0_print(FILE *f)
{
int rc, members = 0;
- UINT32 i, u32 = *(UINT32 *)buf;
+ UINT32 i;
+ UINT32 *u32 = (UINT32 *) &buf;
PRINT("version: 0\n");
- PRINT("number of keys: %u\n", u32);
+ PRINT("number of keys: %u\n", *u32);
/* The +- 1's below account for the byte we read in to determine
* if the PS file had a version byte at the beginning */
@@ -209,7 +210,7 @@ version_0_print(FILE *f)
return -1;
}
- for (i = 1; i < u32; i++) {
+ for (i = 1; i < *u32; i++) {
/* read in subsequent key's headers */
if ((members = fread(buf, 2*sizeof(TSS_UUID) + 3*sizeof(UINT16),
1, f)) != 1) {
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
TrouSerS-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/trousers-tech
