thr3ads.net - Xen devel - [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660 [Mar 2007]

If this information is useful, please help other people find it:
Share via:

Mathieu Desnoyers

2007-Mar-03 06:16 UTC

[Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Compile issue with tools/libfsimage/iso9660

char vs unsigned char signedness causes a warning when compiling
iso9660 (xen-unstable). This patch changes the unsigned char * for
char *.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff -r 8eff89a69521 tools/libfsimage/iso9660/fsys_iso9660.c
--- a/tools/libfsimage/iso9660/fsys_iso9660.c	Fri Mar 02 18:42:00 2007 -0500
+++ b/tools/libfsimage/iso9660/fsys_iso9660.c	Fri Mar 02 23:59:19 2007 -0500
@@ -53,8 +53,8 @@ struct iso_inode_info {
     ((struct iso_inode_info *)(FSYS_BUF+sizeof(struct iso_sb_info)))
 #define PRIMDESC        ((struct iso_primary_descriptor *)(FSYS_BUF + 2048))
 #define DIRREC          ((struct iso_directory_record *)(FSYS_BUF + 4096))
-#define RRCONT_BUF      ((unsigned char *)(FSYS_BUF + 6144))
-#define NAME_BUF        ((unsigned char *)(FSYS_BUF + 8192))
+#define RRCONT_BUF      ((char *)(FSYS_BUF + 6144))
+#define NAME_BUF        ((char *)(FSYS_BUF + 8192))
 
 
 #define log2 grub_log2
@@ -207,7 +207,7 @@ iso9660_dir (fsi_file_t *ffi, char *dirn
 	      rr_len = (idr->length.l - idr->name_len.l
 			- sizeof(struct iso_directory_record)
 			+ sizeof(idr->name));
-	      rr_ptr.ptr = ((unsigned char *)idr + idr->name_len.l
+	      rr_ptr.ptr = ((char *)idr + idr->name_len.l
 			    + sizeof(struct iso_directory_record)
 			    - sizeof(idr->name));
 	      if (rr_ptr.i & 1)
@@ -334,8 +334,8 @@ iso9660_dir (fsi_file_t *ffi, char *dirn
 		  if (rr_len < 4 && ce_ptr != NULL)
 		    {
 		      /* preserve name before loading new extent. */
-		      if( RRCONT_BUF <= (unsigned char *)name
-			  && (unsigned char *)name < RRCONT_BUF + ISO_SECTOR_SIZE )
+		      if( RRCONT_BUF <= (char *)name
+			  && (char *)name < RRCONT_BUF + ISO_SECTOR_SIZE )
 			{
 			  memcpy(NAME_BUF, name, name_len);
 			  name = NAME_BUF;
diff -r 8eff89a69521 tools/libfsimage/iso9660/iso9660.h
--- a/tools/libfsimage/iso9660/iso9660.h	Fri Mar 02 18:42:00 2007 -0500
+++ b/tools/libfsimage/iso9660/iso9660.h	Sat Mar 03 01:14:37 2007 -0500
@@ -105,7 +105,7 @@ struct iso_directory_record {
   iso_8bit_t	interleave;
   iso_16bit_t	volume_seq_number;
   iso_8bit_t	name_len;
-  u_int8_t	name[1];
+  char		name[1];
 } __attribute__ ((packed));
 
 struct iso_primary_descriptor {
@@ -188,7 +188,7 @@ struct rock_ridge {
     } sl;
     struct NM {
       iso_8bit_t	flags;
-      u_int8_t	name[0];
+      char		name[0];
     } nm;
     struct CL {
       iso_32bit_t	location;
-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Keir Fraser

2007-Mar-04 12:42 UTC

head link

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

On 3/3/07 06:16, "Mathieu Desnoyers"
<compudj@krystal.dyndns.org> wrote:
> Compile issue with tools/libfsimage/iso9660
> 
> char vs unsigned char signedness causes a warning when compiling
> iso9660 (xen-unstable). This patch changes the unsigned char * for
> char *.
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
A similar patch has been in xen-unstable for a fortnight. Where do you get
your bits from?

 -- Keir



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Mathieu Desnoyers

2007-Mar-04 21:04 UTC

head link

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

* Keir Fraser (Keir.Fraser@cl.cam.ac.uk) wrote:> On 3/3/07 06:16, "Mathieu Desnoyers"
<compudj@krystal.dyndns.org> wrote:
> 
> > Compile issue with tools/libfsimage/iso9660
> > 
> > char vs unsigned char signedness causes a warning when compiling
> > iso9660 (xen-unstable). This patch changes the unsigned char * for
> > char *.
> > 
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
> 
> A similar patch has been in xen-unstable for a fortnight. Where do you get
> your bits from?
> 
compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg pull
pulling from http://xenbits.xensource.com/xen-unstable.hg
searching for changes
no changes found

Maybe something went wrong with the merge and I missed it ?
>  -- Keir
> 
> 
-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Keir Fraser

2007-Mar-04 22:23 UTC

head link

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

On 4/3/07 21:04, "Mathieu Desnoyers"
<compudj@krystal.dyndns.org> wrote:
> compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg pull
> pulling from http://xenbits.xensource.com/xen-unstable.hg
> searching for changes
> no changes found
> 
> Maybe something went wrong with the merge and I missed it ?
The existing changeset that fixes this issue is 14038:335a8280ab1d9a87.
Perhaps you have pulled the latest changesets into your local repository but
not updated you locally-checked-out copy? How do ''hg heads''
and ''hg parents''
match up for you?

 -- Keir



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Mathieu Desnoyers

2007-Mar-05 06:16 UTC

head link

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

* Keir Fraser (Keir.Fraser@cl.cam.ac.uk) wrote:> On 4/3/07 21:04, "Mathieu Desnoyers"
<compudj@krystal.dyndns.org> wrote:
> 
> > compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg pull
> > pulling from http://xenbits.xensource.com/xen-unstable.hg
> > searching for changes
> > no changes found
> > 
> > Maybe something went wrong with the merge and I missed it ?
> 
> The existing changeset that fixes this issue is 14038:335a8280ab1d9a87.
> Perhaps you have pulled the latest changesets into your local repository
but
> not updated you locally-checked-out copy? How do ''hg
heads'' and ''hg parents''
> match up for you?
I have :

compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg heads
changeset:   14209:d62b52c15b53
tag:         tip
user:        compudj@dijkstra.casi.polymtl.ca
date:        Sat Mar 03 03:04:05 2007 -0500
summary:     ltt-tracer.c compiles ok.

changeset:   14206:3ac19fda0bc2
user:        kfraser@localhost.localdomain
date:        Fri Mar 02 12:11:52 2007 +0000
summary:     linux: Support new ''fast suspend'' mode which does
not
require us to

dijkstra:~/xen/xen-unstable-lttng.hg$ hg parents
changeset:   14209:d62b52c15b53
tag:         tip
user:        compudj@dijkstra.casi.polymtl.ca
date:        Sat Mar 03 03:04:05 2007 -0500
summary:     ltt-tracer.c compiles ok.

I guess I should merge 14206:3ac19fda0bc2 into tip ?

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Mathieu Desnoyers

2007-Mar-05 06:18 UTC

head link

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

* Keir Fraser (Keir.Fraser@cl.cam.ac.uk) wrote:> On 4/3/07 21:04, "Mathieu Desnoyers"
<compudj@krystal.dyndns.org> wrote:
> 
> > compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg pull
> > pulling from http://xenbits.xensource.com/xen-unstable.hg
> > searching for changes
> > no changes found
> > 
> > Maybe something went wrong with the merge and I missed it ?
> 
> The existing changeset that fixes this issue is 14038:335a8280ab1d9a87.
> Perhaps you have pulled the latest changesets into your local repository
but
> not updated you locally-checked-out copy? How do ''hg
heads'' and ''hg parents''
> match up for you?
> 
>  -- Keir
> 
> 
The issue seems solved :

compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg merge 14206
merging tools/libfsimage/iso9660/fsys_iso9660.c
merging xen/common/sysctl.c
merging xen/include/asm-x86/config.h
345 files updated, 3 files merged, 1 files removed, 0 files unresolved


Thanks,

Mathieu


-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Reasonably Related Threads

Search for more maybe matching threads

Xen devel - Mar 2007 - [PATCH] Compile issue with tools/libfsimage/iso9660

[Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

Reasonably Related Threads