ipa-client code cleanup

Fixes errors about implicit function declaration and moves duplicated
gettext code into a common module. Also silences some warnings.

Signed-off-by: Simo Sorce <ssorce@redhat.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/ipa-client/ipa-join.c b/ipa-client/ipa-join.c
index e67f29b81..01afa1ad0 100644
--- a/ipa-client/ipa-join.c
+++ b/ipa-client/ipa-join.c
@@ -38,8 +38,7 @@
 #include "xmlrpc-c/base.h"
 #include "xmlrpc-c/client.h"
 
-#include <libintl.h>
-#define _(STRING) gettext(STRING)
+#include "ipa-client-common.h"
 
 #define NAME "ipa-join"
 #define VERSION "1.0"
@@ -82,14 +81,6 @@ getIPAserver(char * data) {
     return get_config_entry(data, "global", "server");
 }
 
-/* Get the IPA realm from the configuration file.
- * The caller is responsible for freeing this value
- */
-static char *
-getIPArealm(char * data) {
-    return get_config_entry(data, "global", "realm");
-}
-
 /* Make sure that the keytab is writable before doing anything */
 static int check_perms(const char *keytab)
 {
@@ -951,7 +942,7 @@ cleanup:
  * unique (host already added).
  */
 int
-main(int argc, char **argv) {
+main(int argc, const char **argv) {
     static const char *hostname = NULL;
     static const char *server = NULL;
     static const char *keytab = NULL;