diff options
| author |   nicm <nicm@openbsd.org> | 2010-05-16 20:26:39 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-05-16 20:26:39 +0000 |
| commit | 7aea9c4dc5c99caabc6d6c306f82c5679987d741 (patch) | |
| tree | 3758a86bd35ca4a8fd8867bbfb3a2164b459307b | |
| parent | fix (again) TKIP MIC entries in set_key(). (diff) | |
| download | wireguard-openbsd-7aea9c4dc5c99caabc6d6c306f82c5679987d741.tar.xz wireguard-openbsd-7aea9c4dc5c99caabc6d6c306f82c5679987d741.zip | |
Make the DE_INTERNALIZE/EXTERNALIZE macros copy to/from the struct
direntry deName[8]/deExtension[3] buffers separately rather than in one
11 byte copy. Makes gcc4 -Wbounded happy.
ok krw
| -rw-r--r-- | sys/msdosfs/denode.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h index 03b648587a5..66aaeb91f90 100644 --- a/sys/msdosfs/denode.h +++ b/sys/msdosfs/denode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: denode.h,v 1.21 2007/06/02 02:04:21 deraadt Exp $ */ +/* $OpenBSD: denode.h,v 1.22 2010/05/16 20:26:39 nicm Exp $ */ /* $NetBSD: denode.h,v 1.24 1997/10/17 11:23:39 ws Exp $ */ /*- @@ -189,7 +189,8 @@ struct denode { #define DE_INTERNALIZE32(dep, dp) \ ((dep)->de_StartCluster |= getushort((dp)->deHighClust) << 16) #define DE_INTERNALIZE(dep, dp) \ - (bcopy((dp)->deName, (dep)->de_Name, 11), \ + (bcopy((dp)->deName, (dep)->de_Name, 8), \ + bcopy((dp)->deExtension, (dep)->de_Name + 8, 3), \ (dep)->de_Attributes = (dp)->deAttributes, \ (dep)->de_CTimeHundredth = (dp)->deCTimeHundredth, \ (dep)->de_CTime = getushort((dp)->deCTime), \ @@ -202,7 +203,8 @@ struct denode { (FAT32((dep)->de_pmp) ? DE_INTERNALIZE32((dep), (dp)) : 0)) #define DE_EXTERNALIZE(dp, dep) \ - (bcopy((dep)->de_Name, (dp)->deName, 11), \ + (bcopy((dep)->de_Name, (dp)->deName, 8), \ + bcopy((dep)->de_Name + 8, (dp)->deExtension, 3), \ (dp)->deAttributes = (dep)->de_Attributes, \ (dp)->deLowerCase = CASE_LOWER_BASE | CASE_LOWER_EXT, \ (dp)->deCTimeHundredth = (dep)->de_CTimeHundredth, \ |