create bti.h

Moved the main data structure into there, this will let us
(hopefully) start refactoring the code to be a bit more readable
and maintainable over the long-run.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/Makefile.am b/Makefile.am
index 7b5953e07384a2e0740e3f77c0d0d399ad0f0c8f..c3ab9472ad2dac99e998bc68986ba4c7c62ed1f4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ bin_SCRIPTS = \
        bti-shrink-urls
 
 bti_SOURCES = \
        bti-shrink-urls
 
 bti_SOURCES = \

+       bti.h \

        bti.c
 
 bti_CFLAGS = \
        bti.c
 
 bti_CFLAGS = \

diff --git a/bti.c b/bti.c
index 428e4bc2685fafedf15f9ee40b12740b6acb9e9a..b5a01d3921cbeeed81233fd1f318a5330bb3a158 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -40,7 +40,7 @@
 #include <termios.h>
 #include <dlfcn.h>
 #include <oauth.h>
 #include <termios.h>
 #include <dlfcn.h>
 #include <oauth.h>

-
+#include "bti.h"

 
 #define zalloc(size)   calloc(size, 1)
 
 
 #define zalloc(size)   calloc(size, 1)
 


@@ -54,64 +54,6 @@
 
 static int debug;
 
 
 static int debug;
 

-enum host {
-       HOST_TWITTER  = 0,
-       HOST_IDENTICA = 1,
-       HOST_CUSTOM   = 2
-};
-
-enum action {
-       ACTION_UPDATE  = 0,
-       ACTION_FRIENDS = 1,
-       ACTION_USER    = 2,
-       ACTION_REPLIES = 4,
-       ACTION_PUBLIC  = 8,
-       ACTION_GROUP   = 16,
-       ACTION_RETWEET = 32,
-       ACTION_UNKNOWN = 64
-};
-
-struct session {
-       char *password;
-       char *account;
-       char *consumer_key;
-       char *consumer_secret;
-       char *access_token_key;
-       char *access_token_secret;
-       char *tweet;
-       char *proxy;
-       char *time;
-       char *homedir;
-       char *logfile;
-       char *user;
-       char *group;
-       char *hosturl;
-       char *hostname;
-       char *configfile;
-       char *replyto;
-       char *retweet;
-       int bash;
-       int background;
-       int interactive;
-       int shrink_urls;
-       int dry_run;
-       int page;
-       int no_oauth;
-       int guest;
-       int verbose;
-       enum host host;
-       enum action action;
-       void *readline_handle;
-       char *(*readline)(const char *);
-};
-
-struct bti_curl_buffer {
-       char *data;
-       struct session *session;
-       enum action action;
-       int length;
-};
-

 static void display_help(void)
 {
        fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"
 static void display_help(void)
 {
        fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"

diff --git a/bti.h b/bti.h
new file mode 100644 (file)
index 0000000..ebdbb41
--- /dev/null
+++ b/bti.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2008-2011 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
+ * Copyright (C) 2009-2010 Amir Mohammad Saied <amirsaied@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __BTI_H
+#define __BTI_H
+
+enum host {
+       HOST_TWITTER  = 0,
+       HOST_IDENTICA = 1,
+       HOST_CUSTOM   = 2
+};
+
+enum action {
+       ACTION_UPDATE  = 0,
+       ACTION_FRIENDS = 1,
+       ACTION_USER    = 2,
+       ACTION_REPLIES = 4,
+       ACTION_PUBLIC  = 8,
+       ACTION_GROUP   = 16,
+       ACTION_RETWEET = 32,
+       ACTION_UNKNOWN = 64
+};
+
+struct session {
+       char *password;
+       char *account;
+       char *consumer_key;
+       char *consumer_secret;
+       char *access_token_key;
+       char *access_token_secret;
+       char *tweet;
+       char *proxy;
+       char *time;
+       char *homedir;
+       char *logfile;
+       char *user;
+       char *group;
+       char *hosturl;
+       char *hostname;
+       char *configfile;
+       char *replyto;
+       char *retweet;
+       int bash;
+       int background;
+       int interactive;
+       int shrink_urls;
+       int dry_run;
+       int page;
+       int no_oauth;
+       int guest;
+       int verbose;
+       enum host host;
+       enum action action;
+       void *readline_handle;
+       char *(*readline)(const char *);
+};
+
+struct bti_curl_buffer {
+       char *data;
+       struct session *session;
+       enum action action;
+       int length;
+};
+
+#endif