Merge branch 'develop' of github.com:sahib/rmlint into develop

sahib · Mar 20, 2016 · 46af287 · 46af287
2 parents 47eac94 + 7d017e4
commit 46af287
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/formats/sh.c.in b/lib/formats/sh.c.in
@@ -120,8 +120,8 @@ static bool rm_sh_emit_handler_reflink(RmFmtHandlerShScript *self, char **out, R
     return true;
 }
 
-static bool rm_sh_emit_handler_symlink(RmFmtHandlerShScript *self, char **out, RmFile *file, _UNUSED char *dupe_path, _UNUSED char *orig_path, char *dupe_escaped, char *orig_escaped) {
-    if(!self->allow_symlink || self->last_original->dev != file->dev) {
+static bool rm_sh_emit_handler_symlink(RmFmtHandlerShScript *self, char **out, _UNUSED RmFile *file, _UNUSED char *dupe_path, _UNUSED char *orig_path, char *dupe_escaped, char *orig_escaped) {
+    if(!self->allow_symlink) {
         return false;
     }
 
@@ -130,7 +130,7 @@ static bool rm_sh_emit_handler_symlink(RmFmtHandlerShScript *self, char **out, R
 }
 
 static bool rm_sh_emit_handler_hardlink(RmFmtHandlerShScript *self, char **out, _UNUSED RmFile *file, _UNUSED char *dupe_path, _UNUSED char *orig_path, char *dupe_escaped, char *orig_escaped) {
-    if(!self->allow_hardlink) {
+    if(!self->allow_hardlink || self->last_original->dev != file->dev) {
         return false;
     }