correct code format (indent)

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@860 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_HD44780.c b/drv_HD44780.c
index e85f9e171c035b4731054e75090a052009817cf3..64b41753a6e30d6d5a02fe9c03c07f612b6f4092 100644 (file)
--- a/drv_HD44780.c
+++ b/drv_HD44780.c
@@ -984,7 +984,7 @@ static int drv_HD_GPO(const int num, const int val)
 
 static int drv_HD_LCM162_keypad_handler(const int num)
 {
-  return num;
+    return num;
 }
 
 static void drv_HD_LCM162_timer(void __attribute__ ((unused)) * notused)
@@ -1008,16 +1008,23 @@ static void drv_HD_LCM162_timer(void __attribute__ ((unused)) * notused)
     if (data != temp) {
        data = temp;
 
-       int KEYPAD_VAL=0;
+       int KEYPAD_VAL = 0;
        keynum = (data & mask3 ? 1 : 0) + (data & mask5 ? 2 : 0);
-       switch(keynum)
-         {
-         default:
-         case 0: KEYPAD_VAL=WIDGET_KEY_CANCEL; break;
-         case 1: KEYPAD_VAL=WIDGET_KEY_UP; break;
-         case 2: KEYPAD_VAL=WIDGET_KEY_CONFIRM; break;
-         case 3: KEYPAD_VAL=WIDGET_KEY_DOWN; break;
-         }
+       switch (keynum) {
+       default:
+       case 0:
+           KEYPAD_VAL = WIDGET_KEY_CANCEL;
+           break;
+       case 1:
+           KEYPAD_VAL = WIDGET_KEY_UP;
+           break;
+       case 2:
+           KEYPAD_VAL = WIDGET_KEY_CONFIRM;
+           break;
+       case 3:
+           KEYPAD_VAL = WIDGET_KEY_DOWN;
+           break;
+       }
 
        updown = (data & mask6 ? 1 : 0);
        KEYPAD_VAL += updown ? WIDGET_KEY_PRESSED : WIDGET_KEY_RELEASED;

diff --git a/plugin_button_exec.c b/plugin_button_exec.c
index 2568d54aff0d3315803e584970ae4dd28652d812..f56da24f6bdb1277f8bddd9dc439b08ea93a7e17 100644 (file)
--- a/plugin_button_exec.c
+++ b/plugin_button_exec.c
@@ -58,40 +58,38 @@
 
 static void my_button_exec(RESULT * result, int argc, RESULT * argv[])
 {
-       int pid;
-       int i;
-       int errsv;
-       char *args[argc+1]; 
-       char *arg;
-       char *prog;
-       char *env[1];
-       
-       signal(SIGCHLD, SIG_IGN);
-       prog=R2S(argv[0]);
-       info(prog);
-       for (i=1; i < argc; i++) {
-               arg=R2S(argv[i]);
-               args[i]=arg;
-               info(arg);      
-       }
-       args[i]=(char *) 0; 
-       env[0]=(char *) 0;
-       pid=fork();
-       if (pid==0) { // child-process
-               // char *args[] = {"-r", "-t", "-l", (char *) 0 };
-               info("executing program");
-               execve(prog, args, env);
-               errsv=errno;
-               info("executing program failed");
-               info(strerror(errsv));
-               exit(0);
-       }
-       else if (pid==-1) {
-               info("weird error has occured. couldn't fork.");
-       }
-       else {
-               SetResult(&result, R_STRING, "0");
-       }
+    int pid;
+    int i;
+    int errsv;
+    char *args[argc + 1];
+    char *arg;
+    char *prog;
+    char *env[1];
+
+    signal(SIGCHLD, SIG_IGN);
+    prog = R2S(argv[0]);
+    info(prog);
+    for (i = 1; i < argc; i++) {
+       arg = R2S(argv[i]);
+       args[i] = arg;
+       info(arg);
+    }
+    args[i] = (char *) 0;
+    env[0] = (char *) 0;
+    pid = fork();
+    if (pid == 0) {            // child-process
+       // char *args[] = {"-r", "-t", "-l", (char *) 0 };
+       info("executing program");
+       execve(prog, args, env);
+       errsv = errno;
+       info("executing program failed");
+       info(strerror(errsv));
+       exit(0);
+    } else if (pid == -1) {
+       info("weird error has occured. couldn't fork.");
+    } else {
+       SetResult(&result, R_STRING, "0");
+    }
 }
 
 

diff --git a/plugin_gps.c b/plugin_gps.c
index f84e9c0eff6d6e9536ad09442047453991ac3fce..01ecf7dd1a718ee7396c1fbb754fbeec71a049d6 100644 (file)
--- a/plugin_gps.c
+++ b/plugin_gps.c
@@ -113,7 +113,7 @@
 
 #include "nmeap.h"
 
-//#define EMULATE                      //remove comment to enable gps data emulation...
+//#define EMULATE                       //remove comment to enable gps data emulation...
 #define EMU_BUFFER_READ_SIZE 128       //how many bytes are read each loop aka emulation speed
 #define BUFFER_SIZE 256
 

diff --git a/plugin_mpd.c b/plugin_mpd.c
index bdf22ed19e8abe66bd349e5ea73077bdd341d436..b4e4b1242e7a151f84e36ac9062da97ebd879f28 100644 (file)
--- a/plugin_mpd.c
+++ b/plugin_mpd.c
@@ -110,8 +110,8 @@ static unsigned long l_dbPlayTime;
 static int l_playlistLength;
 /* pos in playlist */
 static int l_currentSongPos;
-static unsigned int l_sampleRate;      
-static int l_channels;         
+static unsigned int l_sampleRate;
+static int l_channels;
 
 static mpd_Song *currentSong;
 
@@ -123,7 +123,7 @@ static int plugin_enabled;
 static int waittime;
 struct timeval timestamp;
 
-static mpd_Connection * conn;
+static mpd_Connection *conn;
 static char Section[] = "Plugin:MPD";
 
 
@@ -141,11 +141,11 @@ static int configure_mpd(void)
     if (cfg_number(Section, "enabled", 0, 0, 1, &plugin_enabled) < 1) {
        plugin_enabled = 0;
     }
-    
-    if (plugin_enabled != 1){
+
+    if (plugin_enabled != 1) {
        info("[MPD] WARNING: Plugin is not enabled! (set 'enabled 1' to enable this plugin)");
        configured = 1;
-       return configured;    
+       return configured;
     }
 
     /* read server */
@@ -155,7 +155,7 @@ static int configure_mpd(void)
        strcpy(host, "localhost");
     } else
        strcpy(host, s);
-       
+
     free(s);
 
     /* read port */
@@ -180,56 +180,54 @@ static int configure_mpd(void)
     }
 
     debug("[MPD] connection detail: [%s:%d]", host, iport);
-    configured = 1;        
+    configured = 1;
     return configured;
 }
 
 
 static int mpd_update()
 {
-    int ret = -1;    
-    struct timeval now;    
+    int ret = -1;
+    struct timeval now;
 
     /* reread every 1000 msec only */
-    gettimeofday(&now, NULL);    
+    gettimeofday(&now, NULL);
     int timedelta = (now.tv_sec - timestamp.tv_sec) * 1000 + (now.tv_usec - timestamp.tv_usec) / 1000;
-    
-    if (timedelta < waittime) {      
+
+    if (timedelta < waittime) {
        //debug("[MPD] waittime not reached...\n");
        return 1;
-    }    
-
+    }
     //check if configured
     if (configure_mpd() < 0) {
        return -1;
     }
-
     //check if connected
-    if (conn==NULL || conn->error) {
+    if (conn == NULL || conn->error) {
        if (conn) {
-           debug("[MPD] Error: [%s], try to reconnect to [%s]:[%i]\n", conn->errorStr, host, iport);
+           debug("[MPD] Error: [%s], try to reconnect to [%s]:[%i]\n", conn->errorStr, host, iport);
            mpd_closeConnection(conn);
-        }
-       else debug("[MPD] initialize connect to [%s]:[%i]\n", host, iport);
-       
+       } else
+           debug("[MPD] initialize connect to [%s]:[%i]\n", host, iport);
+
        conn = mpd_newConnection(host, iport, TIMEOUT_IN_S);
-        if(conn->error) {
-           error("[MPD] connection failed, give up...");
+       if (conn->error) {
+           error("[MPD] connection failed, give up...");
            gettimeofday(&timestamp, NULL);
-           return -1;
-        }
-       
+           return -1;
+       }
+
        debug("[MPD] connection fixed...");
     }
-    
-    mpd_Status * status=NULL;
-    mpd_Stats *stats=NULL;
-    mpd_InfoEntity * entity;
-    
+
+    mpd_Status *status = NULL;
+    mpd_Stats *stats = NULL;
+    mpd_InfoEntity *entity;
+
     mpd_sendCommandListOkBegin(conn);
-    mpd_sendStatsCommand(conn); 
+    mpd_sendStatsCommand(conn);
 
-    if(conn->error) {
+    if (conn->error) {
        error("[MPD] error: %s", conn->errorStr);
        return -1;
     }
@@ -240,81 +238,79 @@ static int mpd_update()
 
 //stats
     stats = mpd_getStats(conn);
-    if(stats==NULL) {                  
+    if (stats == NULL) {
        error("[MPD] error mpd_getStats: %s", conn->errorStr);
        goto cleanup;
-    }  
-
+    }
 //status
-    mpd_nextListOkCommand(conn);    
-    if((status = mpd_getStatus(conn))==NULL) {
+    mpd_nextListOkCommand(conn);
+    if ((status = mpd_getStatus(conn)) == NULL) {
        error("[MPD] error mpd_nextListOkCommand: %s", conn->errorStr);
        goto cleanup;
     }
-               
 //song    
     mpd_nextListOkCommand(conn);
-    while((entity = mpd_getNextInfoEntity(conn))) {
-       mpd_Song * song = entity->info.song;
+    while ((entity = mpd_getNextInfoEntity(conn))) {
+       mpd_Song *song = entity->info.song;
 
-       if(entity->type!=MPD_INFO_ENTITY_TYPE_SONG) {
+       if (entity->type != MPD_INFO_ENTITY_TYPE_SONG) {
            mpd_freeInfoEntity(entity);
            continue;
        }
-       if (currentSong!=NULL)
-           mpd_freeSong(currentSong);
-       
+       if (currentSong != NULL)
+           mpd_freeSong(currentSong);
+
        currentSong = mpd_songDup(song);
        mpd_freeInfoEntity(entity);
     }
-               
-    l_elapsedTimeSec   = status->elapsedTime;
-    l_totalTimeSec     = status->totalTime;
-    l_repeatEnabled    = status->repeat;
-    l_randomEnabled    = status->random;
-    l_bitRate          = status->bitRate;    
-    l_state            = status->state;
-    l_volume           = status->volume;
-    l_playlistLength   = status->playlistLength;
-    l_currentSongPos   = status->song+1;
-    l_sampleRate       = status->sampleRate;
-    l_channels                 = status->channels;
-    
-    l_numberOfSongs    = stats->numberOfSongs;
-    l_uptime           = stats->uptime;
-    l_playTime                 = stats->playTime;
-    l_dbPlayTime       = stats->dbPlayTime;
-
-               
+
+    l_elapsedTimeSec = status->elapsedTime;
+    l_totalTimeSec = status->totalTime;
+    l_repeatEnabled = status->repeat;
+    l_randomEnabled = status->random;
+    l_bitRate = status->bitRate;
+    l_state = status->state;
+    l_volume = status->volume;
+    l_playlistLength = status->playlistLength;
+    l_currentSongPos = status->song + 1;
+    l_sampleRate = status->sampleRate;
+    l_channels = status->channels;
+
+    l_numberOfSongs = stats->numberOfSongs;
+    l_uptime = stats->uptime;
+    l_playTime = stats->playTime;
+    l_dbPlayTime = stats->dbPlayTime;
+
+
     /* sanity checks */
     if (l_volume < 0 || l_volume > 100)
        l_volume = 0;
 
     if (l_bitRate < 0)
        l_bitRate = 0;
-       
+
     if (l_elapsedTimeSec > l_totalTimeSec || l_elapsedTimeSec < 0)
        l_elapsedTimeSec = 0;
     ret = 0;
-    
-cleanup:
-    if (stats!=NULL)
+
+  cleanup:
+    if (stats != NULL)
        mpd_freeStats(stats);
-      
-    if (status!=NULL)  
+
+    if (status != NULL)
        mpd_freeStatus(status);
 
-    if(conn->error) {
+    if (conn->error) {
        error("[MPD] error: %s", conn->errorStr);
        return -1;
     }
 
     mpd_finishCommand(conn);
-    if(conn->error) {                  
+    if (conn->error) {
        error("[MPD] error mpd_finishCommand: %s", conn->errorStr);
        return -1;
-    }  
-       
+    }
+
     gettimeofday(&timestamp, NULL);
     return ret;
 }
@@ -324,7 +320,7 @@ static void elapsedTimeSec(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_elapsedTimeSec;
+    d = (double) l_elapsedTimeSec;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -333,7 +329,7 @@ static void totalTimeSec(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_totalTimeSec;
+    d = (double) l_totalTimeSec;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -341,7 +337,7 @@ static void bitRate(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_bitRate;
+    d = (double) l_bitRate;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -350,7 +346,7 @@ static void getRepeatInt(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_repeatEnabled;
+    d = (double) l_repeatEnabled;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -359,7 +355,7 @@ static void getRandomInt(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_randomEnabled;
+    d = (double) l_randomEnabled;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -367,53 +363,56 @@ static void getRandomInt(RESULT * result)
 static void getArtist(RESULT * result)
 {
     mpd_update();
-    if (currentSong!=NULL) {
-       if (currentSong->artist!=NULL) {
+    if (currentSong != NULL) {
+       if (currentSong->artist != NULL) {
            SetResult(&result, R_STRING, currentSong->artist);
        } else {
-           if (currentSong->file!=NULL)
+           if (currentSong->file != NULL)
                SetResult(&result, R_STRING, currentSong->file);
            else
                SetResult(&result, R_STRING, "");
        }
-    } else SetResult(&result, R_STRING, "");
-    
+    } else
+       SetResult(&result, R_STRING, "");
+
 }
 
 static void getTitle(RESULT * result)
 {
     mpd_update();
-    if (currentSong!=NULL) {
-       if (currentSong->title!=NULL) {
-           SetResult(&result, R_STRING, currentSong->title);
-       } else SetResult(&result, R_STRING, "");
-    } else SetResult(&result, R_STRING, "");
+    if (currentSong != NULL) {
+       if (currentSong->title != NULL) {
+           SetResult(&result, R_STRING, currentSong->title);
+       } else
+           SetResult(&result, R_STRING, "");
+    } else
+       SetResult(&result, R_STRING, "");
 
 }
 
 static void getAlbum(RESULT * result)
 {
     mpd_update();
-    if (currentSong!=NULL) {    
-       if (currentSong->album!=NULL)
-           SetResult(&result, R_STRING, currentSong->album);
-        else 
-           SetResult(&result, R_STRING, "");
-    } 
-    else SetResult(&result, R_STRING, "");
+    if (currentSong != NULL) {
+       if (currentSong->album != NULL)
+           SetResult(&result, R_STRING, currentSong->album);
+       else
+           SetResult(&result, R_STRING, "");
+    } else
+       SetResult(&result, R_STRING, "");
 }
 
 static void getFilename(RESULT * result)
 {
     mpd_update();
-    if (currentSong!=NULL) {
-       if (currentSong->file!=NULL)
-           SetResult(&result, R_STRING, currentSong->file);
-        else 
-           SetResult(&result, R_STRING, "");
-    } 
-    else SetResult(&result, R_STRING, "");
-    
+    if (currentSong != NULL) {
+       if (currentSong->file != NULL)
+           SetResult(&result, R_STRING, currentSong->file);
+       else
+           SetResult(&result, R_STRING, "");
+    } else
+       SetResult(&result, R_STRING, "");
+
 }
 
 /*  
@@ -452,7 +451,7 @@ static void getVolume(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_volume;
+    d = (double) l_volume;
     /* return 0..100 or < 0 when failed */
     SetResult(&result, R_NUMBER, &d);
 }
@@ -462,7 +461,7 @@ static void getSongsInDb(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_numberOfSongs;
+    d = (double) l_numberOfSongs;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -470,7 +469,7 @@ static void getMpdUptime(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_uptime;
+    d = (double) l_uptime;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -478,7 +477,7 @@ static void getMpdPlayTime(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_playTime;
+    d = (double) l_playTime;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -486,7 +485,7 @@ static void getMpdDbPlayTime(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_dbPlayTime;
+    d = (double) l_dbPlayTime;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -494,7 +493,7 @@ static void getMpdPlaylistLength(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_playlistLength;
+    d = (double) l_playlistLength;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -502,7 +501,7 @@ static void getCurrentSongPos(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_currentSongPos;
+    d = (double) l_currentSongPos;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -510,7 +509,7 @@ static void getAudioChannels(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_channels;
+    d = (double) l_channels;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -518,7 +517,7 @@ static void getSamplerateHz(RESULT * result)
 {
     double d;
     mpd_update();
-    d = (double)l_sampleRate;
+    d = (double) l_sampleRate;
     SetResult(&result, R_NUMBER, &d);
 }
 
@@ -571,9 +570,9 @@ int plugin_init_mpd(void)
     debug("[MPD] v0.81, check lcd4linux configuration file...");
 
     check = configure_mpd();
-    if (plugin_enabled != 1) 
+    if (plugin_enabled != 1)
        return 0;
-    
+
     if (check)
        debug("[MPD] configured!");
     else
@@ -581,7 +580,7 @@ int plugin_init_mpd(void)
 
     //when mpd dies, do NOT exit application, ignore it!
     signal(SIGPIPE, SIG_IGN);
-    gettimeofday(&timestamp, NULL);    
+    gettimeofday(&timestamp, NULL);
 
     AddFunction("mpd::artist", 0, getArtist);
     AddFunction("mpd::title", 0, getTitle);
@@ -612,9 +611,9 @@ int plugin_init_mpd(void)
 
 void plugin_exit_mpd(void)
 {
-    if (plugin_enabled == 1){
+    if (plugin_enabled == 1) {
        debug("[MPD] disconnect from mpd");
-       if (currentSong!=NULL)
+       if (currentSong != NULL)
            mpd_freeSong(currentSong);
        mpd_closeConnection(conn);
     }

diff --git a/widget_text.c b/widget_text.c
index dfcf6dd2b7f607383881a1cb537af2eb8f131ec7..948540ba176d1a6ac015aaf432b5ca06fdaa0e91 100644 (file)
--- a/widget_text.c
+++ b/widget_text.c
@@ -96,41 +96,38 @@ void widget_text_scroll(void *Self)
        T->scroll++;
        if (T->scroll >= width + len)
            T->scroll = 0;
-       break;  
+       break;
     case ALIGN_PINGPONG:
 #define PINGPONGWAIT 2
 
        /* scrolling is not necessary - center the string */
        if (len <= width) {
            pad = (width - len) / 2;
-       }
-       else {
+       } else {
            if (T->direction == 1)
-               T->scroll++;            /* scroll right */
+               T->scroll++;    /* scroll right */
            else
-               T->scroll--;            /* scroll left */
-               
-           /*pad = if positive, add leading space characters, else offset of string begin */   
-           pad = 0-T->scroll;
-           
-           if (pad < 0-(len-width)) {
+               T->scroll--;    /* scroll left */
+
+           /*pad = if positive, add leading space characters, else offset of string begin */
+           pad = 0 - T->scroll;
+
+           if (pad < 0 - (len - width)) {
                if (T->delay-- < 1) {   /* wait before switch direction */
                    T->direction = 0;   /* change scroll direction */
                    T->delay = PINGPONGWAIT;
                    T->scroll -= PINGPONGWAIT;
-               } /* else debug("wait1"); */
-               pad = 0-(len-width);
-           } 
-           else
-           if (pad > 0) {
+               }               /* else debug("wait1"); */
+               pad = 0 - (len - width);
+           } else if (pad > 0) {
                if (T->delay-- < 1) {
                    T->direction = 1;
                    T->delay = PINGPONGWAIT;
                    T->scroll += PINGPONGWAIT;
-               } /* else debug("wait2"); */
+               }               /* else debug("wait2"); */
                pad = 0;
            }
-           
+
        }
        break;
     default:                   /* not reached  */
@@ -256,12 +253,12 @@ void widget_text_update(void *Self)
 
     /* something has changed and should be updated */
     if (update) {
-       /* reset marquee counter if content has changed */      
+       /* reset marquee counter if content has changed */
        T->scroll = 0;
-       
+
        /* Init pingpong scroller. start scrolling left (wrong way) to get a delay */
        if (T->align == ALIGN_PINGPONG) {
-           T->direction = 0;   
+           T->direction = 0;
            T->delay = PINGPONGWAIT;
        }
        /* if there's a marquee scroller active, it has its own */
@@ -332,7 +329,7 @@ int widget_text_init(WIDGET * Self)
        break;
     case 'P':
        Text->align = ALIGN_PINGPONG;
-       break;                                  
+       break;
     default:
        error("widget %s has unknown alignment '%s', using 'Left'", section, c);
        Text->align = ALIGN_LEFT;