send_request needs to return a negative error value.

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index 17a2a9396badba7f770002c67d99f842fa6e24c8..147d44b0d55e9d94d704c9c3b3488407f27321df 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -284,8 +284,8 @@ static CURL *curl_init(void)
 }
 
 /* The final place data is sent to the screen/pty/tty */
 }
 
 /* The final place data is sent to the screen/pty/tty */

-void bti_output_line(struct session *session, xmlChar *user, xmlChar *id,
-                    xmlChar *created, xmlChar *text)
+static void bti_output_line(struct session *session, xmlChar *user,
+                           xmlChar *id, xmlChar *created, xmlChar *text)

 {
        if (session->verbose)
                printf("[%s] {%s} (%.16s) %s\n", user, id, created, text);
 {
        if (session->verbose)
                printf("[%s] {%s} (%.16s) %s\n", user, id, created, text);


@@ -726,7 +726,7 @@ static int send_request(struct session *session)
 
                if (!reply) {
                        fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);
 
                if (!reply) {
                        fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);

-                       return 1;
+                       return -EIO;

                }
 
                if ((session->action != ACTION_UPDATE) &&
                }
 
                if ((session->action != ACTION_UPDATE) &&


@@ -1124,7 +1124,6 @@ int main(int argc, char *argv[], char *envp[])
        struct session *session;
        pid_t child;
        char *tweet;
        struct session *session;
        pid_t child;
        char *tweet;

-       char *retweet;

        static char password[80];
        int retval = 0;
        int option;
        static char password[80];
        int retval = 0;
        int option;


@@ -1166,7 +1165,7 @@ int main(int argc, char *argv[], char *envp[])
 
        while (1) {
                option = getopt_long_only(argc, argv,
 
        while (1) {
                option = getopt_long_only(argc, argv,

-                                         "dp:P:H:a:A:u:c:hg:G:sr:nVv",
+                                         "dp:P:H:a:A:u:c:hg:G:sr:nVvw:",

                                          options, NULL);
                if (option == -1)
                        break;
                                          options, NULL);
                if (option == -1)
                        break;


@@ -1365,17 +1364,21 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        if (session->action == ACTION_RETWEET) {
        }
 
        if (session->action == ACTION_RETWEET) {

-               fprintf(stdout, "Status ID to retweet: ");
-               retweet = get_string_from_stdin();
+               if (!session->retweet) {
+                       char *rtid;
+
+                       fprintf(stdout, "Status ID to retweet: ");
+                       rtid = get_string_from_stdin();
+                       session->retweet = zalloc(strlen(rtid) + 10);
+                       sprintf(session->retweet,"%s", rtid);
+                       free(rtid);
+               }

 
 

-               if (!retweet || strlen(retweet) == 0) {
+               if (!session->retweet || strlen(session->retweet) == 0) {

                        dbg("no retweet?\n");
                        return -1;
                }
 
                        dbg("no retweet?\n");
                        return -1;
                }
 

-               session->retweet = zalloc(strlen(retweet) + 10);
-               sprintf(session->retweet,"%s", retweet);
-               free(retweet);

                dbg("retweet ID = %s\n", session->retweet);
        }
 
                dbg("retweet ID = %s\n", session->retweet);
        }