Mercurial > libpst
diff src/libpst.c @ 114:e213bfcf9aa7 stable-0-6-24
patch from Chris Eagle to build on cygwin
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Thu, 11 Dec 2008 11:58:22 -0800 |
| parents | 7133b39975f7 |
| children | ed2a260bbb98 |
line wrap: on
line diff
--- a/src/libpst.c Thu Dec 04 10:46:42 2008 -0800 +++ b/src/libpst.c Thu Dec 11 11:58:22 2008 -0800 @@ -493,8 +493,7 @@ typedef struct pst_x_attrib { - uint16_t extended; - uint16_t zero; + uint32_t extended; uint16_t type; uint16_t map; } pst_x_attrib; @@ -560,8 +559,7 @@ } memcpy(&xattrib, &(buffer[bptr]), sizeof(xattrib)); - LE16_CPU(xattrib.extended); - LE16_CPU(xattrib.zero); + LE32_CPU(xattrib.extended); LE16_CPU(xattrib.type); LE16_CPU(xattrib.map); bptr += sizeof(xattrib); @@ -572,8 +570,8 @@ ptr->type = xattrib.type; ptr->map = xattrib.map+0x8000; ptr->next = NULL; - DEBUG_INDEX(("xattrib: ext = %#hx, zero = %#hx, type = %#hx, map = %#hx\n", - xattrib.extended, xattrib.zero, xattrib.type, xattrib.map)); + DEBUG_INDEX(("xattrib: ext = %#x, type = %#hx, map = %#hx\n", + xattrib.extended, xattrib.type, xattrib.map)); err=0; if (xattrib.type & 0x0001) { // if the Bit 1 is set // pointer to Unicode field in buffer @@ -623,8 +621,7 @@ ptr = NULL; } memcpy(&xattrib, &(buffer[bptr]), sizeof(xattrib)); - LE16_CPU(xattrib.extended); - LE16_CPU(xattrib.zero); + LE32_CPU(xattrib.extended); LE16_CPU(xattrib.type); LE16_CPU(xattrib.map); bptr += sizeof(xattrib);