yan/archived-lcd4linux
1
0
Fork 0
mirror of https://github.com/netfun2000/lcd4linux.git synced 2026-02-27 09:44:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

indentation

Browse Source 
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1150 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
This commit is contained in:
michael
2011-07-27 02:53:04 +00:00
parent 48ea1dd640
commit 2a765ae84d
4 changed files with 306 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugin_mpd.c
View File

@@ -144,8 +144,7 @@ static char * char_conv_from;
#define BUFFER_SIZE 1024 #define BUFFER_SIZE 1024
static void static void charset_close(void)
charset_close(void)
{ {
if (char_conv_to) { if (char_conv_to) {
iconv_close(char_conv_iconv); iconv_close(char_conv_iconv);
@@ -156,11 +155,9 @@ charset_close(void)
} }
} }
static int static int charset_set(const char *to, const char *from)
charset_set(const char *to, const char *from)
{ {
if(char_conv_to && strcmp(to,char_conv_to)==0 && if (char_conv_to && strcmp(to, char_conv_to) == 0 && char_conv_from && strcmp(from, char_conv_from) == 0)
char_conv_from && strcmp(from,char_conv_from)==0)
return 0; return 0;
charset_close(); charset_close();
@@ -174,8 +171,7 @@ charset_set(const char *to, const char *from)
} }
static inline size_t deconst_iconv(iconv_t cd, static inline size_t deconst_iconv(iconv_t cd,
const char **inbuf, size_t *inbytesleft, const char **inbuf, size_t * inbytesleft, char **outbuf, size_t * outbytesleft)
char **outbuf, size_t *outbytesleft)
{ {
union { union {
const char **a; const char **a;
@@ -187,8 +183,7 @@ static inline size_t deconst_iconv(iconv_t cd,
return iconv(cd, deconst.b, inbytesleft, outbuf, outbytesleft); return iconv(cd, deconst.b, inbytesleft, outbuf, outbytesleft);
} }
static char * static char *charset_conv_strdup(const char *string)
charset_conv_strdup(const char *string)
{ {
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
size_t inleft = strlen(string); size_t inleft = strlen(string);
@@ -198,17 +193,16 @@ charset_conv_strdup(const char *string)
size_t err; size_t err;
char *bufferPtr; char *bufferPtr;
if(!char_conv_to) return NULL; if (!char_conv_to)
return NULL;
ret = strdup(""); ret = strdup("");
while (inleft) { while (inleft) {
bufferPtr = buffer; bufferPtr = buffer;
outleft = BUFFER_SIZE; outleft = BUFFER_SIZE;
err = deconst_iconv(char_conv_iconv,&string,&inleft,&bufferPtr, err = deconst_iconv(char_conv_iconv, &string, &inleft, &bufferPtr, &outleft);
&outleft); if (outleft == BUFFER_SIZE || (err == (size_t) - 1 /* && errno != E2BIG */ )) {
if (outleft == BUFFER_SIZE ||
(err == (size_t)-1/* && errno != E2BIG*/)) {
free(ret); free(ret);
return NULL; return NULL;
} }
@@ -222,11 +216,12 @@ charset_conv_strdup(const char *string)
return ret; return ret;
} }
const char * const char *charset_from_utf8(const char *from)
charset_from_utf8(const char *from) { {
static char *to = NULL; static char *to = NULL;
if(to) free(to); if (to)
free(to);
charset_set("ISO−8859−1", "UTF-8"); charset_set("ISO−8859−1", "UTF-8");
to = charset_conv_strdup(from); to = charset_conv_strdup(from);
@@ -322,9 +317,7 @@ void mpd_query_status(struct mpd_connection *conn)
return; return;
if (!mpd_command_list_begin(conn, true) || if (!mpd_command_list_begin(conn, true) ||
!mpd_send_status(conn) || !mpd_send_status(conn) || !mpd_send_current_song(conn) || !mpd_command_list_end(conn)) {
!mpd_send_current_song(conn) ||
!mpd_command_list_end(conn)) {
mpd_printerror("queue_commands"); mpd_printerror("queue_commands");
return; return;
} }
@@ -380,8 +373,7 @@ void mpd_query_status(struct mpd_connection *conn)
} }
if (mpd_status_get_error(status) != NULL) if (mpd_status_get_error(status) != NULL)
error("[MPD] query status : %s", error("[MPD] query status : %s", charset_from_utf8(mpd_status_get_error(status)));
charset_from_utf8(mpd_status_get_error(status)));
mpd_status_free(status); mpd_status_free(status);
@@ -398,9 +390,7 @@ void mpd_query_stats(struct mpd_connection *conn)
if (!conn) if (!conn)
return; return;
if (!mpd_command_list_begin(conn, true) || if (!mpd_command_list_begin(conn, true) || !mpd_send_stats(conn) || !mpd_command_list_end(conn)) {
!mpd_send_stats(conn) ||
!mpd_command_list_end(conn)) {
mpd_printerror("queue_commands"); mpd_printerror("queue_commands");
return; return;
} }