comparison mcabber/src/jabglue.c @ 533:c478e8f7f074

Make some functions static
author Mikael Berthe <mikael@lilotux.net>
date Thu, 24 Nov 2005 00:11:40 +0100
parents 2ac8d8e49e81
children 3569d38f7bbb
comparison
equal deleted inserted replaced
532:2ac8d8e49e81 533:c478e8f7f074
61 enum imstatus st; 61 enum imstatus st;
62 const char *msg; 62 const char *msg;
63 }; 63 };
64 64
65 65
66 void statehandler(jconn, int); 66 static void statehandler(jconn, int);
67 void packethandler(jconn, jpacket); 67 static void packethandler(jconn, jpacket);
68 68
69 static void logger(jconn j, int io, const char *buf) 69 static void logger(jconn j, int io, const char *buf)
70 { 70 {
71 scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf); 71 scr_LogPrint(LPRINT_DEBUG, "%03s: %s", ((io == 0) ? "OUT" : "IN"), buf);
72 } 72 }
96 */ 96 */
97 97
98 // jidtodisp(jid) 98 // jidtodisp(jid)
99 // Strips the resource part from the jid 99 // Strips the resource part from the jid
100 // The caller should g_free the result after use. 100 // The caller should g_free the result after use.
101 char *jidtodisp(const char *jid) 101 static char *jidtodisp(const char *jid)
102 { 102 {
103 char *ptr; 103 char *ptr;
104 char *alias; 104 char *alias;
105 105
106 alias = g_strdup(jid); 106 alias = g_strdup(jid);
110 } 110 }
111 return alias; 111 return alias;
112 } 112 }
113 113
114 char *compose_jid(const char *username, const char *servername, 114 char *compose_jid(const char *username, const char *servername,
115 const char *resource) 115 const char *resource)
116 { 116 {
117 char *jid = g_new(char, 3 + 117 char *jid = g_new(char, 3 +
118 strlen(username) + strlen(servername) + strlen(resource)); 118 strlen(username) + strlen(servername) + strlen(resource));
119 strcpy(jid, username); 119 strcpy(jid, username);
120 if (!strchr(jid, '@')) { 120 if (!strchr(jid, '@')) {
626 jab_send(jc, x); 626 jab_send(jc, x);
627 xmlnode_free(x); 627 xmlnode_free(x);
628 jb_reset_keepalive(); 628 jb_reset_keepalive();
629 } 629 }
630 630
631 void postlogin() 631 static void postlogin()
632 { 632 {
633 //int i; 633 //int i;
634 634
635 //flogged = TRUE; 635 //flogged = TRUE;
636 //ourstatus = available; 636 //ourstatus = available;
678 unlink(conf.getconfigfname("jabber-infoset").c_str()); 678 unlink(conf.getconfigfname("jabber-infoset").c_str());
679 } 679 }
680 */ 680 */
681 } 681 }
682 682
683 void gotloggedin(void) 683 static void gotloggedin(void)
684 { 684 {
685 xmlnode x; 685 xmlnode x;
686 686
687 x = jutil_iqnew(JPACKET__GET, NS_AGENTS); 687 x = jutil_iqnew(JPACKET__GET, NS_AGENTS);
688 xmlnode_put_attrib(x, "id", "Agent List"); 688 xmlnode_put_attrib(x, "id", "Agent List");
693 xmlnode_put_attrib(x, "id", "Roster"); 693 xmlnode_put_attrib(x, "id", "Roster");
694 jab_send(jc, x); 694 jab_send(jc, x);
695 xmlnode_free(x); 695 xmlnode_free(x);
696 } 696 }
697 697
698 void gotroster(xmlnode x) 698 static void gotroster(xmlnode x)
699 { 699 {
700 xmlnode y, z; 700 xmlnode y, z;
701 701
702 for (y = xmlnode_get_tag(x, "item"); y; y = xmlnode_get_nextsibling(y)) { 702 for (y = xmlnode_get_tag(x, "item"); y; y = xmlnode_get_nextsibling(y)) {
703 const char *alias = xmlnode_get_attrib(y, "jid"); 703 const char *alias = xmlnode_get_attrib(y, "jid");
739 } 739 }
740 740
741 postlogin(); 741 postlogin();
742 } 742 }
743 743
744 void gotmessage(char *type, const char *from, const char *body, 744 static void gotmessage(char *type, const char *from, const char *body,
745 const char *enc, time_t timestamp) 745 const char *enc, time_t timestamp)
746 { 746 {
747 char *jid; 747 char *jid;
748 const char *rname; 748 const char *rname;
749 gchar *buffer = from_utf8(body); 749 gchar *buffer = from_utf8(body);
750 750
767 hk_message_in(jid, rname, timestamp, buffer, type); 767 hk_message_in(jid, rname, timestamp, buffer, type);
768 g_free(jid); 768 g_free(jid);
769 g_free(buffer); 769 g_free(buffer);
770 } 770 }
771 771
772 const char *defaulterrormsg(int code) 772 static const char *defaulterrormsg(int code)
773 { 773 {
774 const char *desc; 774 const char *desc;
775 775
776 switch(code) { 776 switch(code) {
777 case 401: desc = "Unauthorized"; 777 case 401: desc = "Unauthorized";
814 } 814 }
815 815
816 // display_server_error(x) 816 // display_server_error(x)
817 // Display the error to the user 817 // Display the error to the user
818 // x: error tag xmlnode pointer 818 // x: error tag xmlnode pointer
819 void display_server_error(xmlnode x) 819 static void display_server_error(xmlnode x)
820 { 820 {
821 const char *desc = NULL; 821 const char *desc = NULL;
822 int code = 0; 822 int code = 0;
823 char *s; 823 char *s;
824 const char *p; 824 const char *p;
849 if (s && *s) desc = s; // FIXME utf8?? 849 if (s && *s) desc = s; // FIXME utf8??
850 850
851 scr_LogPrint(LPRINT_LOGNORM, "Error code from server: %d %s", code, desc); 851 scr_LogPrint(LPRINT_LOGNORM, "Error code from server: %d %s", code, desc);
852 } 852 }
853 853
854 void statehandler(jconn conn, int state) 854 static void statehandler(jconn conn, int state)
855 { 855 {
856 static int previous_state = -1; 856 static int previous_state = -1;
857 857
858 scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state); 858 scr_LogPrint(LPRINT_DEBUG, "StateHandler called (state=%d).", state);
859 859
895 break; 895 break;
896 } 896 }
897 previous_state = state; 897 previous_state = state;
898 } 898 }
899 899
900 void packethandler(jconn conn, jpacket packet) 900 static void packethandler(jconn conn, jpacket packet)
901 { 901 {
902 char *p, *r, *s; 902 char *p, *r, *s;
903 const char *m, *rname; 903 const char *m, *rname;
904 xmlnode x, y; 904 xmlnode x, y;
905 char *from=NULL, *type=NULL, *body=NULL, *enc=NULL; 905 char *from=NULL, *type=NULL, *body=NULL, *enc=NULL;