Merge branch 'trivial-fixes' of https://github.com/agimenez/bti into agimenez-trivial...
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:44:16 +0000 (15:44 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:44:16 +0000 (15:44 -0800)
Conflicts:
bti.c

bti.c
config.c

diff --git a/bti.c b/bti.c
index 9c3b7f470ef97a38abf4092b44e803be7e12c688..18b8116c56d576754e8bb307450d59e2335a068c 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 */
-static 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);
index 7315c6962fe9db53cbaeebfe706e538bd1df1ac8..346fed8ceaacc83d4b86d2c7f68424a9d4df9f35 100644 (file)
--- a/config.c
+++ b/config.c
@@ -140,7 +140,7 @@ static int get_key(struct session *session, char *line, char **key, char **value
                 * the value.
                 */
        }
-       printf("%s = %s\n", *key, *value);
+       /* printf("%s = %s\n", *key, *value); */
        return 0;
 }
 
@@ -309,7 +309,10 @@ static void process_line(struct session *session, char *key, char *value)
                        break;
 
                if (strncasecmp(item->key, key, strlen(item->key)) == 0) {
-                       printf("calling %p, for key = '%s' and value = '%s'\n", item->callback, key, value);
+                       /*
+                        * printf("calling %p, for key = '%s' and value = * '%s'\n",
+                        *        item->callback, key, value);
+                        */
                        result = item->callback(session, value);
                        if (!result)
                                return;