From d417f97f8ea7c03a06dc7b8c89d00f70a684f529 Mon Sep 17 00:00:00 2001
From: Andrew Ayer <agwa@andrewayer.name>
Date: Sat, 5 Jul 2014 14:22:55 -0700
Subject: [PATCH] Make argv arrays const

---
 commands.cpp      | 28 ++++++++++++++--------------
 commands.hpp      | 26 +++++++++++++-------------
 git-crypt.cpp     |  2 +-
 parse_options.cpp |  4 ++--
 parse_options.hpp |  2 +-
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/commands.cpp b/commands.cpp
index 08d0c9c..7d93f65 100644
--- a/commands.cpp
+++ b/commands.cpp
@@ -389,7 +389,7 @@ static void encrypt_repo_key (const char* key_name, const Key_file::Entry& key,
 	}
 }
 
-static int parse_plumbing_options (const char** key_name, const char** key_file, int argc, char** argv)
+static int parse_plumbing_options (const char** key_name, const char** key_file, int argc, const char** argv)
 {
 	Options_list	options;
 	options.push_back(Option_def("-k", key_name));
@@ -402,7 +402,7 @@ static int parse_plumbing_options (const char** key_name, const char** key_file,
 
 
 // Encrypt contents of stdin and write to stdout
-int clean (int argc, char** argv)
+int clean (int argc, const char** argv)
 {
 	const char*		key_name = 0;
 	const char*		key_path = 0;
@@ -522,7 +522,7 @@ int clean (int argc, char** argv)
 }
 
 // Decrypt contents of stdin and write to stdout
-int smudge (int argc, char** argv)
+int smudge (int argc, const char** argv)
 {
 	const char*		key_name = 0;
 	const char*		key_path = 0;
@@ -559,7 +559,7 @@ int smudge (int argc, char** argv)
 	return 0;
 }
 
-int diff (int argc, char** argv)
+int diff (int argc, const char** argv)
 {
 	const char*		key_name = 0;
 	const char*		key_path = 0;
@@ -611,7 +611,7 @@ int diff (int argc, char** argv)
 	return 0;
 }
 
-int init (int argc, char** argv)
+int init (int argc, const char** argv)
 {
 	const char*	key_name = 0;
 	Options_list	options;
@@ -661,7 +661,7 @@ int init (int argc, char** argv)
 	return 0;
 }
 
-int unlock (int argc, char** argv)
+int unlock (int argc, const char** argv)
 {
 	// 0. Make sure working directory is clean (ignoring untracked files)
 	// We do this because we run 'git checkout -f HEAD' later and we don't
@@ -780,7 +780,7 @@ int unlock (int argc, char** argv)
 	return 0;
 }
 
-int add_gpg_key (int argc, char** argv)
+int add_gpg_key (int argc, const char** argv)
 {
 	const char*		key_name = 0;
 	Options_list		options;
@@ -863,13 +863,13 @@ int add_gpg_key (int argc, char** argv)
 	return 0;
 }
 
-int rm_gpg_key (int argc, char** argv) // TODO
+int rm_gpg_key (int argc, const char** argv) // TODO
 {
 	std::clog << "Error: rm-gpg-key is not yet implemented." << std::endl;
 	return 1;
 }
 
-int ls_gpg_keys (int argc, char** argv) // TODO
+int ls_gpg_keys (int argc, const char** argv) // TODO
 {
 	// Sketch:
 	// Scan the sub-directories in .git-crypt/keys, outputting something like this:
@@ -889,7 +889,7 @@ int ls_gpg_keys (int argc, char** argv) // TODO
 	return 1;
 }
 
-int export_key (int argc, char** argv)
+int export_key (int argc, const char** argv)
 {
 	// TODO: provide options to export only certain key versions
 	const char*		key_name = 0;
@@ -921,7 +921,7 @@ int export_key (int argc, char** argv)
 	return 0;
 }
 
-int keygen (int argc, char** argv)
+int keygen (int argc, const char** argv)
 {
 	if (argc != 1) {
 		std::clog << "Usage: git-crypt keygen KEYFILE" << std::endl;
@@ -950,7 +950,7 @@ int keygen (int argc, char** argv)
 	return 0;
 }
 
-int migrate_key (int argc, char** argv)
+int migrate_key (int argc, const char** argv)
 {
 	if (argc != 1) {
 		std::clog << "Usage: git-crypt migrate-key KEYFILE" << std::endl;
@@ -1000,13 +1000,13 @@ int migrate_key (int argc, char** argv)
 	return 0;
 }
 
-int refresh (int argc, char** argv) // TODO: do a force checkout, much like in unlock
+int refresh (int argc, const char** argv) // TODO: do a force checkout, much like in unlock
 {
 	std::clog << "Error: refresh is not yet implemented." << std::endl;
 	return 1;
 }
 
-int status (int argc, char** argv)
+int status (int argc, const char** argv)
 {
 	// Usage:
 	//  git-crypt status -r [-z]			Show repo status
diff --git a/commands.hpp b/commands.hpp
index 8bba666..2575ca6 100644
--- a/commands.hpp
+++ b/commands.hpp
@@ -40,20 +40,20 @@ struct Error {
 };
 
 // Plumbing commands:
-int clean (int argc, char** argv);
-int smudge (int argc, char** argv);
-int diff (int argc, char** argv);
+int clean (int argc, const char** argv);
+int smudge (int argc, const char** argv);
+int diff (int argc, const char** argv);
 // Public commands:
-int init (int argc, char** argv);
-int unlock (int argc, char** argv);
-int add_gpg_key (int argc, char** argv);
-int rm_gpg_key (int argc, char** argv);
-int ls_gpg_keys (int argc, char** argv);
-int export_key (int argc, char** argv);
-int keygen (int argc, char** argv);
-int migrate_key (int argc, char** argv);
-int refresh (int argc, char** argv);
-int status (int argc, char** argv);
+int init (int argc, const char** argv);
+int unlock (int argc, const char** argv);
+int add_gpg_key (int argc, const char** argv);
+int rm_gpg_key (int argc, const char** argv);
+int ls_gpg_keys (int argc, const char** argv);
+int export_key (int argc, const char** argv);
+int keygen (int argc, const char** argv);
+int migrate_key (int argc, const char** argv);
+int refresh (int argc, const char** argv);
+int status (int argc, const char** argv);
 
 #endif
 
diff --git a/git-crypt.cpp b/git-crypt.cpp
index decc889..58b9923 100644
--- a/git-crypt.cpp
+++ b/git-crypt.cpp
@@ -81,7 +81,7 @@ static void print_usage (std::ostream& out)
 }
 
 
-int main (int argc, char** argv)
+int main (int argc, const char** argv)
 try {
 	argv0 = argv[0];
 
diff --git a/parse_options.cpp b/parse_options.cpp
index dc93133..51b51f7 100644
--- a/parse_options.cpp
+++ b/parse_options.cpp
@@ -42,7 +42,7 @@ static const Option_def* find_option (const Options_list& options, const std::st
 	return 0;
 }
 
-int parse_options (const Options_list& options, int argc, char** argv)
+int parse_options (const Options_list& options, int argc, const char** argv)
 {
 	int	argi = 0;
 
@@ -53,7 +53,7 @@ int parse_options (const Options_list& options, int argc, char** argv)
 		} else if (std::strncmp(argv[argi], "--", 2) == 0) {
 			std::string			option_name;
 			const char*			option_value = 0;
-			if (char* eq = std::strchr(argv[argi], '=')) {
+			if (const char* eq = std::strchr(argv[argi], '=')) {
 				option_name.assign(argv[argi], eq);
 				option_value = eq + 1;
 			} else {
diff --git a/parse_options.hpp b/parse_options.hpp
index d02ddaa..c0580f0 100644
--- a/parse_options.hpp
+++ b/parse_options.hpp
@@ -48,7 +48,7 @@ struct Option_def {
 
 typedef std::vector<Option_def> Options_list;
 
-int parse_options (const Options_list& options, int argc, char** argv);
+int parse_options (const Options_list& options, int argc, const char** argv);
 
 struct Option_error {
 	std::string	option_name;