Commit Diff

Commit:
a807c50bd11f3ba2b72a8d02a1714efd21c2799c
From:
Josh Rickmar <jrick@zettaport.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
Define apply_umask earlier, without predeclaration ok op@
Actions:
Patch | Tree
commit - 1a70a2078b605112beede15564122b377eeba92d
commit + a807c50bd11f3ba2b72a8d02a1714efd21c2799c
blob - 8ef0f4b40ba4b3c694de8a7b76cbbfb7abdf572e
blob + c37442751587cf69a16efc88767683c2588a57db
--- lib/worktree.c
+++ lib/worktree.c
@@ -62,7 +62,15 @@
 #define GOT_MERGE_LABEL_MERGED	"merged change"
 #define GOT_MERGE_LABEL_BASE	"3-way merge base"
 
-static mode_t		 apply_umask(mode_t);
+static mode_t
+apply_umask(mode_t mode)
+{
+	mode_t um;
+
+	um = umask(000);
+	umask(um);
+	return mode & ~um;
+}
 
 static const struct got_error *
 create_meta_file(const char *path_got, const char *name, const char *content)
@@ -1126,16 +1134,6 @@ get_ondisk_perms(int executable, mode_t st_mode)
 	}
 
 	return st_mode;
-}
-
-static mode_t
-apply_umask(mode_t mode)
-{
-	mode_t um;
-
-	um = umask(000);
-	umask(um);
-	return mode & ~um;
 }
 
 /* forward declaration */