projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 2 problems: rmdir of non-empty dir, handling 255 char names better
[yaffs2.git]
/
yaffs_packedtags1.c
diff --git
a/yaffs_packedtags1.c
b/yaffs_packedtags1.c
index 43f5873e83f2877dc5c5c96a7e077323039bad01..3e67e69166663feeb76871b6307b01bf80e9773f 100644
(file)
--- a/
yaffs_packedtags1.c
+++ b/
yaffs_packedtags1.c
@@
-9,13
+9,12
@@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
- *
*/
#include "yaffs_packedtags1.h"
#include "yportenv.h"
*/
#include "yaffs_packedtags1.h"
#include "yportenv.h"
-void yaffs_PackTags1(yaffs_PackedTags1 *
pt, const yaffs_ExtendedTags *
t)
+void yaffs_PackTags1(yaffs_PackedTags1 *
pt, const yaffs_ExtendedTags *
t)
{
pt->chunkId = t->chunkId;
pt->serialNumber = t->serialNumber;
{
pt->chunkId = t->chunkId;
pt->serialNumber = t->serialNumber;
@@
-28,7
+27,7
@@
void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
}
}
-void yaffs_UnpackTags1(yaffs_ExtendedTags *
t, const yaffs_PackedTags1 *
pt)
+void yaffs_UnpackTags1(yaffs_ExtendedTags *
t, const yaffs_PackedTags1 *
pt)
{
static const __u8 allFF[] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
{
static const __u8 allFF[] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@
-36,9
+35,8
@@
void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
t->blockBad = 0;
if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
t->blockBad = 0;
- if (pt->shouldBeFF != 0xFFFFFFFF)
{
+ if (pt->shouldBeFF != 0xFFFFFFFF)
t->blockBad = 1;
t->blockBad = 1;
- }
t->chunkUsed = 1;
t->objectId = pt->objectId;
t->chunkId = pt->chunkId;
t->chunkUsed = 1;
t->objectId = pt->objectId;
t->chunkId = pt->chunkId;
@@
-48,6
+46,5
@@
void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
t->serialNumber = pt->serialNumber;
} else {
memset(t, 0, sizeof(yaffs_ExtendedTags));
t->serialNumber = pt->serialNumber;
} else {
memset(t, 0, sizeof(yaffs_ExtendedTags));
-
}
}
}
}