libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made development macro Libisofs_hardlink_matcheR unconditional

Browse Source 
and removed an unused variable.
This commit is contained in:
Thomas Schmitt
2009-08-22 22:27:24 +02:00
parent 3f918d1acb
commit b1c4571a95
8 changed files with 1 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libisofs/node.c
View File

@ -1310,13 +1310,9 @@ int iso_node_new_symlink(char *name, char *dest, IsoSymlink **link)
new->node.name = name;
new->dest = dest;
new->node.mode = S_IFLNK;
#ifdef Libisofs_hardlink_matcheR
new->fs_id = 0;
new->st_dev = 0;
new->st_ino = 0;
#endif
*link = new;
return ISO_SUCCESS;
}
@ -1348,13 +1344,9 @@ int iso_node_new_special(char *name, mode_t mode, dev_t dev,
new->node.mode = mode;
new->dev = dev;
#ifdef Libisofs_hardlink_matcheR
new->fs_id = 0;
new->st_dev = 0;
new->st_ino = 0;
#endif
*special = new;
return ISO_SUCCESS;
}
@ -2301,8 +2293,6 @@ int iso_node_get_id(IsoNode *node, unsigned int *fs_id, dev_t *dev_id,
}
return 1;
#ifdef Libisofs_hardlink_matcheR
} else if (node->type == LIBISO_SYMLINK) {
symlink = (IsoSymlink *) node;
if (symlink->fs_id != ISO_IMAGE_FS_ID && (flag & 1)) {
@ -2325,8 +2315,6 @@ int iso_node_get_id(IsoNode *node, unsigned int *fs_id, dev_t *dev_id,
*ino_id = special->st_ino;
return 1;
#endif
}
ret = 0;
@ -2381,8 +2369,6 @@ int iso_node_set_ino(IsoNode *node, ino_t ino, int flag)
if (ret < 0 || ret == 1)
return ret;
#ifdef Libisofs_hardlink_matcheR
} else if (node->type == LIBISO_SYMLINK) {
symlink = (IsoSymlink *) node;
if (symlink->fs_id == ISO_IMAGE_FS_ID) {
@ -2397,8 +2383,6 @@ int iso_node_set_ino(IsoNode *node, ino_t ino, int flag)
return 1;
}
#endif
}
ret = iso_node_set_ino_xinfo(node, ino, 0);
if (ret < 0)
@ -2473,8 +2457,6 @@ int iso_node_cmp_flag(IsoNode *n1, IsoNode *n2, int flag)
return ret1;
goto inode_match;
#ifdef Libisofs_hardlink_matcheR
} else if (n1->type == LIBISO_SYMLINK) {
l1 = (IsoSymlink *) n1;
@ -2497,8 +2479,6 @@ int iso_node_cmp_flag(IsoNode *n1, IsoNode *n2, int flag)
dev_id2 = s2->st_dev;
ino_id2 = s2->st_ino;
#endif /* Libisofs_hardlink_matcheR */
} else {
return (n1 < n2 ? -1 : 1); /* case n1 == n2 is handled above */
}