summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
ba6e92d)
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
Change-Id: Id51fa03ac69a2fc29aca5ff644178cdfcabe523c
if len(dirName) == 0 {
return
}
if len(dirName) == 0 {
return
}
d := sc.CopyEntryData(dirPtr, ^uint32(0))
d := sc.CopyEntryData(dirPtr, ^uint32(0))
+ if d != nil {
+ t = d.Type()
+ }
entries = append(entries, adapter.StatEntry{
StatIdentifier: adapter.StatIdentifier{
Index: index,
Name: dirName,
},
entries = append(entries, adapter.StatEntry{
StatIdentifier: adapter.StatIdentifier{
Index: index,
Name: dirName,
},
Data: d,
Symlink: adapter.StatType(dirType) == adapter.Symlink,
})
Data: d,
Symlink: adapter.StatType(dirType) == adapter.Symlink,
})
func (ss *statSegmentV2) CopyEntryData(segment dirSegment, index uint32) adapter.Stat {
dirEntry := (*statSegDirectoryEntryV2)(segment)
func (ss *statSegmentV2) CopyEntryData(segment dirSegment, index uint32) adapter.Stat {
dirEntry := (*statSegDirectoryEntryV2)(segment)
- if dirEntry.unionData == 0 {
- debugf("data value or pointer not defined for %s", dirEntry.name)
+ typ := adapter.StatType(dirEntry.directoryType)
+ // skip zero pointer value
+ if typ != statDirScalarIndex && typ != statDirEmpty && dirEntry.unionData == 0 {
+ debugf("data pointer not defined for %s", dirEntry.name)
- switch adapter.StatType(dirEntry.directoryType) {
case statDirScalarIndex:
return adapter.ScalarStat(dirEntry.unionData)
case statDirScalarIndex:
return adapter.ScalarStat(dirEntry.unionData)