astyle: pad operators

Author: l29ah

Makefile

@@ -29,4 +29,4 @@ install: $(EXE)
 	install $(EXE) $(DESTDIR)/usr/bin
 
 astyle:
-	astyle --style=linux --indent=tab --unpad-paren --pad-header *.c *.h
+	astyle --style=linux --indent=tab --unpad-paren --pad-header --pad-oper *.c *.h

fuse.c

@@ -9,7 +9,7 @@ gchar *filter_str(gchar *str)
 {
 	gchar *ch = strchr(str, '\n');
 	if (ch)
-		str[ch-str] = 0;
+		str[ch - str] = 0;
 	g_strstrip(str);
 	return str;
 }
@@ -208,7 +208,7 @@ static int fsreaddir(const char *path, void *buf, fuse_fill_dir_t filler,
 		filler(buf, "log", NULL, 0);
 		filler(buf, "config", NULL, 0);
 		if (roster && (connection_state == ONLINE)) {
-			filler(buf, "roster",NULL, 0);
+			filler(buf, "roster", NULL, 0);
 			filler(buf, "rawxmpp", NULL, 0);
 		}
 		return 0;
@@ -377,7 +377,7 @@ static char *prepare_option(const char *option, const char *buf, size_t size)
 
 	// bool options
 	if ((strcmp(option, "events") == 0) ||
-	    (strcmp(option, "raw_logs")== 0)) {
+	    (strcmp(option, "raw_logs") == 0)) {
 		val = strdup("1"); // just something :)
 	} else {
 		val = filter_str(strndup(buf, size));
@@ -538,7 +538,7 @@ static int fsunlink(const char *path)
 		}
 	}
 	// delete options from /config/, maybe need some checks before actual deleting
-	if (strncmp(path, "/config/",8) == 0) {
+	if (strncmp(path, "/config/", 8) == 0) {
 		path += 8;
 		g_hash_table_remove(config, path);
 	}

hatexmpp.c

@@ -25,7 +25,7 @@ gchar *eventstr(gchar *str)  	/* TODO const */
 		logf("Event: fd_events = %d, str = %s", fd_events, str);
 #endif
 		if (fd_events != -1) {
-			write(fd_events, str, strlen(str)+1);
+			write(fd_events, str, strlen(str) + 1);
 #ifdef DEBUG
 			logf("write to fd_events = %d errno = %d", fd_events, errno);
 #endif
@@ -44,7 +44,7 @@ gchar * logstr(gchar *msg)  	/* TODO const */
 {
 	size_t len;
 
-	g_printf("LOGF: %s",msg);
+	g_printf("LOGF: %s", msg);
 	len = strlen(msg);
 	logs(msg, len);
 

xmpp.c

@@ -17,7 +17,7 @@ gchar *escape(const gchar *src)
 {
 	const gchar esc[] = "\bb\ff\nn\rr\tt\\\\\"\"";
 	// maximum possible length of escaped string
-	gchar *dest = g_malloc(strlen(src)*2+1);
+	gchar *dest = g_malloc(strlen(src) * 2 + 1);
 	const gchar *p = src;
 	gchar *q = dest;
 	const gchar *c;
@@ -35,16 +35,16 @@ gchar *escape(const gchar *src)
 			*q++ = *p;
 		p++;
 	}
-	*q=0;
+	*q = 0;
 	return g_realloc(dest, strlen(dest));
 }
 
 gchar *get_resource(const gchar *jid)
 {
 	gchar *res;
-	res = strchr(jid,'/');
+	res = strchr(jid, '/');
 	if (res)
-		return g_strdup(res+1);
+		return g_strdup(res + 1);
 	return NULL;
 }
 
@@ -65,7 +65,7 @@ static gchar *get_nick(const gchar *jid)
 	ch = strchr(jid, '@');
 	if (!ch)
 		return g_strdup(jid);
-	return g_strndup(jid, ch-jid);
+	return g_strndup(jid, ch - jid);
 }
 
 int banmuc(const char *mucjid, const char *who)
@@ -483,7 +483,7 @@ void connection_close_cb(LmConnection *connection, LmDisconnectReason reason, gp
 	// very stupid autoreconnect routine
 	int delay;
 	const char *delay_s;
-	if ((delay_s = g_hash_table_lookup(config,"auto_reconnect")) && (reason != LM_DISCONNECT_REASON_OK)) {
+	if ((delay_s = g_hash_table_lookup(config, "auto_reconnect")) && (reason != LM_DISCONNECT_REASON_OK)) {
 		delay = atoi(delay_s);
 		logs("Reconnecting in %ds\n", delay);
 		sleep(delay);