code style, indent with tabs

Follow the same code style als MPD itself.  This patch only fixes
parts of the code which are going to be touched in the following bunch
of patches, i.e. there will be more "code style" patches in the
future.

1 files changed, 184 insertions, 195 deletions

diff --git a/src/main.c b/src/main.c
index f3cc155ed..c2c7170eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,25 +60,24 @@ error_msg(gchar *msg)
 static void
 error_callback(mpdclient_t *c, gint error, gchar *msg)
 {
-  gint code = GET_ACK_ERROR_CODE(error);
-
-  error = error & 0xFF;
-  D("Error [%d:%d]> \"%s\"\n", error, code, msg);
-  switch(error)
-    {
-    case MPD_ERROR_CONNPORT:
-    case MPD_ERROR_NORESPONSE:
-      break;
-    case MPD_ERROR_ACK:
-      screen_status_printf("%s", error_msg(msg));
-      screen_bell();
-      break;
-    default:
-      screen_status_printf("%s", msg);
-      screen_bell();
-      doupdate();
-      connected = FALSE;
-    }
+	gint code = GET_ACK_ERROR_CODE(error);
+
+	error = error & 0xFF;
+	D("Error [%d:%d]> \"%s\"\n", error, code, msg);
+	switch (error) {
+	case MPD_ERROR_CONNPORT:
+	case MPD_ERROR_NORESPONSE:
+		break;
+	case MPD_ERROR_ACK:
+		screen_status_printf("%s", error_msg(msg));
+		screen_bell();
+		break;
+	default:
+		screen_status_printf("%s", msg);
+		screen_bell();
+		doupdate();
+		connected = FALSE;
+	}
 }
 
 static void
@@ -132,19 +131,19 @@ exit_and_cleanup(void)
 void
 catch_sigint( int sig )
 {
-  printf("\n%s\n", _("Exiting..."));
-  exit(EXIT_SUCCESS);
+	printf("\n%s\n", _("Exiting..."));
+	exit(EXIT_SUCCESS);
 }
 
 void
 catch_sigcont( int sig )
 {
-  D("catch_sigcont()\n");
+	D("catch_sigcont()\n");
 #ifdef ENABLE_RAW_MODE
-  reset_prog_mode(); /* restore tty modes */
-  refresh();
+	reset_prog_mode(); /* restore tty modes */
+	refresh();
 #endif
-  screen_resize(); 
+	screen_resize();
 }
 
 void
@@ -173,197 +172,187 @@ D(char *format, ...)
 }
 #endif
 
-int 
+int
 main(int argc, const char *argv[])
 {
-  options_t *options;
-  struct sigaction act;
-  const char *charset = NULL;
-  gboolean key_error;
+	options_t *options;
+	struct sigaction act;
+	const char *charset = NULL;
+	gboolean key_error;
 
 #ifdef HAVE_LOCALE_H
-  /* time and date formatting */
-  setlocale(LC_TIME,"");
-  /* care about sorting order etc */
-  setlocale(LC_COLLATE,"");
-  /* charset */
-  setlocale(LC_CTYPE,"");
-  /* initialize charset conversions */
-  charset_init(g_get_charset(&charset));
-  D("charset: %s\n", charset);
+	/* time and date formatting */
+	setlocale(LC_TIME,"");
+	/* care about sorting order etc */
+	setlocale(LC_COLLATE,"");
+	/* charset */
+	setlocale(LC_CTYPE,"");
+	/* initialize charset conversions */
+	charset_init(g_get_charset(&charset));
+	D("charset: %s\n", charset);
 #endif
 
-  /* initialize i18n support */
+	/* initialize i18n support */
 #ifdef ENABLE_NLS
-  setlocale(LC_MESSAGES, "");
-  bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
-  bind_textdomain_codeset(GETTEXT_PACKAGE, charset);
-  textdomain(GETTEXT_PACKAGE);
+	setlocale(LC_MESSAGES, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, charset);
+	textdomain(GETTEXT_PACKAGE);
 #endif
 
-  /* initialize options */
-  options = options_init();
+	/* initialize options */
+	options = options_init();
 
-  /* parse command line options - 1 pass get configuration files */
-  options_parse(argc, argv);
-  
-  /* read configuration */
-  read_configuration(options);
-
-  /* check key bindings */
-  key_error = check_key_bindings(NULL, NULL, 0);
-  
-  /* parse command line options - 2 pass */
-  options_parse(argc, argv);
-
-  /* setup signal behavior - SIGINT */
-  sigemptyset( &act.sa_mask );
-  act.sa_flags    = 0;
-  act.sa_handler = catch_sigint;
-  if( sigaction(SIGINT, &act, NULL)<0 )
-    {
-      perror("signal");
-      exit(EXIT_FAILURE);
-    }
-  /* setup signal behavior - SIGTERM */
-  sigemptyset( &act.sa_mask );
-  act.sa_flags    = 0;
-  act.sa_handler = catch_sigint;
-  if( sigaction(SIGTERM, &act, NULL)<0 )
-    {
-      perror("sigaction()");
-      exit(EXIT_FAILURE);
-    }
-  /* setup signal behavior - SIGCONT */
-  sigemptyset( &act.sa_mask );
-  act.sa_flags    = 0;
-  act.sa_handler = catch_sigcont;
-  if( sigaction(SIGCONT, &act, NULL)<0 )
-    {
-      perror("sigaction(SIGCONT)");
-      exit(EXIT_FAILURE);
-    }
- 
-  /* setup signal behaviour - SIGHUP*/ 
-  sigemptyset( &act.sa_mask );
-  act.sa_flags    = 0;
-  act.sa_handler = catch_sigint;
-  if( sigaction(SIGHUP, &act, NULL)<0 )
-  	{
-  	perror("sigaction(SIGHUP)");
-  	exit(EXIT_FAILURE);
-  	}
-	
-  /* install exit function */
-  atexit(exit_and_cleanup);
-  
-  ncurses_init();
-
-  src_lyr_init ();
-
-  /* connect to our music player daemon */
-  mpd = mpdclient_new();
- 
-  if( mpdclient_connect(mpd, 
-			options->host, 
-			options->port, 
-			10.0, 
-			options->password) )
-    {
-      exit(EXIT_FAILURE);
-    }
+	/* parse command line options - 1 pass get configuration files */
+	options_parse(argc, argv);
 
-  /* if no password is used, but the mpd wants one, the connection
-     might be established but no status information is avaiable */
-  mpdclient_update(mpd);
-  if(!mpd->status)
-    {
-      screen_auth(mpd);
-    }
-  if(!mpd->status) exit(EXIT_FAILURE);
-  
-  connected = TRUE;
-  D("Connected to MPD version %d.%d.%d\n",
-    mpd->connection->version[0],
-    mpd->connection->version[1],
-    mpd->connection->version[2]);
-
-  /* quit if mpd is pre 0.11.0 - song id not supported by mpd */
-  if( MPD_VERSION_LT(mpd, 0,11,0) )
-    {
-      fprintf(stderr,
-	      _("Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"),
-	      mpd->connection->version[0],
-	      mpd->connection->version[1],
-	      mpd->connection->version[2]);
-      exit(EXIT_FAILURE);
-    }
+	/* read configuration */
+	read_configuration(options);
 
-  /* initialize curses */
-  screen_init(mpd);
-  /* install error callback function */
-  mpdclient_install_error_callback(mpd, error_callback);
+	/* check key bindings */
+	key_error = check_key_bindings(NULL, NULL, 0);
 
-  /* initialize timer */
-  timer = g_timer_new();
+	/* parse command line options - 2 pass */
+	options_parse(argc, argv);
 
-  connected = TRUE;
-  while( connected || options->reconnect )
-    {
-      static gdouble t = G_MAXDOUBLE;
+	/* setup signal behavior - SIGINT */
+	sigemptyset( &act.sa_mask );
+	act.sa_flags    = 0;
+	act.sa_handler = catch_sigint;
+	if( sigaction(SIGINT, &act, NULL)<0 ) {
+		perror("signal");
+		exit(EXIT_FAILURE);
+	}
 
-      if( key_error )
-	{
-	  char buf[BUFSIZE];
+	/* setup signal behavior - SIGTERM */
+	sigemptyset( &act.sa_mask );
+	act.sa_flags    = 0;
+	act.sa_handler = catch_sigint;
+	if( sigaction(SIGTERM, &act, NULL)<0 ) {
+		perror("sigaction()");
+		exit(EXIT_FAILURE);
+	}
 
-	  key_error=check_key_bindings(NULL, buf, BUFSIZE);
-	  screen_status_printf("%s", buf);
+	/* setup signal behavior - SIGCONT */
+	sigemptyset( &act.sa_mask );
+	act.sa_flags    = 0;
+	act.sa_handler = catch_sigcont;
+	if( sigaction(SIGCONT, &act, NULL)<0 ) {
+		perror("sigaction(SIGCONT)");
+		exit(EXIT_FAILURE);
 	}
 
-      if( connected && (t>=MPD_UPDATE_TIME || mpd->need_update) )
-	{
-	  mpdclient_update(mpd);
-	  g_timer_start(timer);
+	/* setup signal behaviour - SIGHUP*/
+	sigemptyset( &act.sa_mask );
+	act.sa_flags    = 0;
+	act.sa_handler = catch_sigint;
+	if( sigaction(SIGHUP, &act, NULL)<0 ) {
+		perror("sigaction(SIGHUP)");
+		exit(EXIT_FAILURE);
 	}
 
-      if( connected )
-	{
-	  command_t cmd;
-
-	  screen_update(mpd);
-	  if( (cmd=get_keyboard_command()) != CMD_NONE )
-	    {
-	      screen_cmd(mpd, cmd);
-	      if( cmd==CMD_VOLUME_UP || cmd==CMD_VOLUME_DOWN)
-		/* make shure we dont update the volume yet */
-		g_timer_start(timer);
-	    }
-	  else
-	    screen_idle(mpd);
+	/* install exit function */
+	atexit(exit_and_cleanup);
+
+	ncurses_init();
+
+	src_lyr_init ();
+
+	/* connect to our music player daemon */
+	mpd = mpdclient_new();
+
+	if (mpdclient_connect(mpd,
+			      options->host,
+			      options->port,
+			      10.0,
+			      options->password))
+		exit(EXIT_FAILURE);
+
+	/* if no password is used, but the mpd wants one, the connection
+	   might be established but no status information is avaiable */
+	mpdclient_update(mpd);
+	if (!mpd->status)
+		screen_auth(mpd);
+
+	if (!mpd->status)
+		exit(EXIT_FAILURE);
+
+	connected = TRUE;
+	D("Connected to MPD version %d.%d.%d\n",
+	  mpd->connection->version[0],
+	  mpd->connection->version[1],
+	  mpd->connection->version[2]);
+
+	/* quit if mpd is pre 0.11.0 - song id not supported by mpd */
+	if( MPD_VERSION_LT(mpd, 0,11,0) ) {
+		fprintf(stderr,
+			_("Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"),
+			mpd->connection->version[0],
+			mpd->connection->version[1],
+			mpd->connection->version[2]);
+		exit(EXIT_FAILURE);
 	}
-      else if( options->reconnect )
-	{
-	  screen_status_printf(_("Connecting to %s...  [Press %s to abort]"), 
-			       options->host, get_key_names(CMD_QUIT,0) );
-
-	  if( get_keyboard_command_with_timeout(MPD_RECONNECT_TIME)==CMD_QUIT)
-	    exit(EXIT_SUCCESS);
-	  
-	  if( mpdclient_connect(mpd,
-				options->host,
-				options->port, 
-				1.5,
-				options->password) == 0 )
-	    {
-	      screen_status_printf(_("Connected to %s!"), options->host);
-	      connected = TRUE;
-	    }	  
-	  doupdate();
+
+	/* initialize curses */
+	screen_init(mpd);
+	/* install error callback function */
+	mpdclient_install_error_callback(mpd, error_callback);
+
+	/* initialize timer */
+	timer = g_timer_new();
+
+	connected = TRUE;
+	while (connected || options->reconnect) {
+		static gdouble t = G_MAXDOUBLE;
+
+		if( key_error ) {
+			char buf[BUFSIZE];
+
+			key_error=check_key_bindings(NULL, buf, BUFSIZE);
+			screen_status_printf("%s", buf);
+		}
+
+		if( connected && (t>=MPD_UPDATE_TIME || mpd->need_update) ) {
+			mpdclient_update(mpd);
+			g_timer_start(timer);
+		}
+
+		if( connected ) {
+			command_t cmd;
+
+			screen_update(mpd);
+			if( (cmd=get_keyboard_command()) != CMD_NONE )
+				{
+					screen_cmd(mpd, cmd);
+					if( cmd==CMD_VOLUME_UP || cmd==CMD_VOLUME_DOWN)
+						/* make shure we dont update the volume yet */
+						g_timer_start(timer);
+				}
+			else
+				screen_idle(mpd);
+		} else if (options->reconnect) {
+			screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
+					     options->host, get_key_names(CMD_QUIT,0) );
+
+			if( get_keyboard_command_with_timeout(MPD_RECONNECT_TIME)==CMD_QUIT)
+				exit(EXIT_SUCCESS);
+
+			if (mpdclient_connect(mpd,
+					      options->host, options->port,
+					      1.5,
+					      options->password) == 0) {
+				screen_status_printf(_("Connected to %s!"), options->host);
+				connected = TRUE;
+			}
+
+			doupdate();
+		}
+
+		if (options->enable_xterm_title)
+			update_xterm_title();
+
+		t = g_timer_elapsed(timer, NULL);
 	}
-      if( options->enable_xterm_title )
-	update_xterm_title();
-      t = g_timer_elapsed(timer, NULL);
-    }
-  exit(EXIT_FAILURE);
+	exit(EXIT_FAILURE);
 }