r1515 - trunk/batctl - commits - lists.open-mesh.org

29 Dec 2009

Author: marek
Date: 2009-12-29 13:02:19 +0000 (Tue, 29 Dec 2009)
New Revision: 1515
Modified:
   trunk/batctl/main.c
   trunk/batctl/vis.c
Log:
batctl: adjust vis.c coding style
This patch adjusts the vis.c coding style (using Lindent) to match
the rest of the batctl code better.
Modified: trunk/batctl/main.c
===================================================================

--- trunk/batctl/main.c	2009-12-29 13:02:18 UTC (rev 1514)
+++ trunk/batctl/main.c	2009-12-29 13:02:19 UTC (rev 1515)
@@ -75,9 +75,9 @@
    	exit(EXIT_SUCCESS);
    }
+	/* TODO: remove this generic check here and move it into the individual functions */
    /* check if user is root */
-	if (((strcmp(argv[1], "bisect") != 0) && (strcmp(argv[1], "vis") != 0))
-	    && ((getuid()) || (getgid()))) {
+	if ((strcmp(argv[1], "bisect") != 0) && ((getuid()) || (getgid()))) {
    	fprintf(stderr, "Error - you must be root to run '%s' !\n", argv[0]);
    	exit(EXIT_FAILURE);
    }
Modified: trunk/batctl/vis.c
===================================================================
--- trunk/batctl/vis.c	2009-12-29 13:02:18 UTC (rev 1514)
+++ trunk/batctl/vis.c	2009-12-29 13:02:19 UTC (rev 1515)
@@ -33,294 +33,278 @@
#define TQ_MAX_VALUE 255
-typedef void (*print_tq_t)(char * orig, char * from, const long tq);
-typedef void (*print_HNA_t)(char * orig, char * from);
-typedef void (*print_1st_t)(char * orig);
-typedef void (*print_2nd_t)(char * orig, char * from);
-typedef void (*print_header_t)(void);
-typedef void (*print_footer_t)(void);
+typedef void (*print_tq_t) (char *orig, char *from, const long tq);
+typedef void (*print_HNA_t) (char *orig, char *from);
+typedef void (*print_1st_t) (char *orig);
+typedef void (*print_2nd_t) (char *orig, char *from);
+typedef void (*print_header_t) (void);
+typedef void (*print_footer_t) (void);
-struct funcs
-{
-  print_tq_t print_tq;
-  print_HNA_t print_HNA;
-  print_1st_t print_1st;
-  print_2nd_t print_2nd;
-  print_header_t print_header;
-  print_footer_t print_footer;
+struct funcs {
+	print_tq_t print_tq;
+	print_HNA_t print_HNA;
+	print_1st_t print_1st;
+	print_2nd_t print_2nd;
+	print_header_t print_header;
+	print_footer_t print_footer;
 };
static bool with_HNA = true;
 static bool with_2nd = true;
 static bool with_names = true;
-static void
-usage(void)
+static void usage(void)
 {
-  printf("batctl vis dot {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n");
-  printf("or\n");
-  printf("batctl vis json {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n");
+	printf("batctl vis dot {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n");
+	printf("or\n");
+	printf("batctl vis json {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n");
 }
-static void
-dot_print_tq(char * orig, char * from, const long tq)
+static void dot_print_tq(char *orig, char *from, const long tq)
 {
-  int int_part = TQ_MAX_VALUE / tq;
-  int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000);
+	int int_part = TQ_MAX_VALUE / tq;
+	int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000);
-  printf("\t"%s" -> ",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf(""%s" [label="%d.%d"]\n",
-         get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)),
-         int_part, frac_part);
+	printf("\t"%s" -> ",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf(""%s" [label="%d.%d"]\n",
+	       get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)),
+	       int_part, frac_part);
 }
-static void
-dot_print_HNA(char * orig, char * from)
+static void dot_print_HNA(char *orig, char *from)
 {
-        printf("\t"%s" -> ",
-               get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-        printf(""%s" [label="HNA"]\n",
-               get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t"%s" -> ",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf(""%s" [label="HNA"]\n",
+	       get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
 }
-static void
-dot_print_1st(char * orig)
+static void dot_print_1st(char *orig)
 {
-  printf("\tsubgraph "cluster_%s" {\n",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("\t\t"%s" [peripheries=2]\n",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("\t}\n");
+	printf("\tsubgraph "cluster_%s" {\n",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t\t"%s" [peripheries=2]\n",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t}\n");
 }
-static void
-dot_print_2nd(char * orig, char * from)
+static void dot_print_2nd(char *orig, char *from)
 {
-  printf("\tsubgraph "cluster_%s" {\n",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("\t\t"%s" [peripheries=2]\n",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("\t\t"%s"\n",
-         get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("\t}\n");
+	printf("\tsubgraph "cluster_%s" {\n",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t\t"%s" [peripheries=2]\n",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t\t"%s"\n",
+	       get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t}\n");
 }
-static void
-dot_print_header(void)
+static void dot_print_header(void)
 {
-  printf("digraph {\n");
+	printf("digraph {\n");
 }
-static void
-dot_print_footer(void)
+static void dot_print_footer(void)
 {
-  printf("}\n");
+	printf("}\n");
 }
-const struct funcs dot_funcs =
-  { dot_print_tq,
-    dot_print_HNA,
-    dot_print_1st,
-    dot_print_2nd,
-    dot_print_header,
-    dot_print_footer
+const struct funcs dot_funcs = { dot_print_tq,
+	dot_print_HNA,
+	dot_print_1st,
+	dot_print_2nd,
+	dot_print_header,
+	dot_print_footer
 };
-static void
-json_print_tq(char * orig, char * from, const long tq)
+static void json_print_tq(char *orig, char *from, const long tq)
 {
-  int int_part = TQ_MAX_VALUE / tq;
-  int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000);
+	int int_part = TQ_MAX_VALUE / tq;
+	int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000);
-  printf("\t{ router : "%s", ",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("neighbor : "%s", label : "%d.%d" }\n",
-         get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)),
-         int_part, frac_part);
+	printf("\t{ router : "%s", ",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("neighbor : "%s", label : "%d.%d" }\n",
+	       get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)),
+	       int_part, frac_part);
 }
-static void
-json_print_HNA(char * orig, char * from)
+static void json_print_HNA(char *orig, char *from)
 {
-  printf("\t{ router : "%s", ",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("gateway : "%s", label : "HNA" }\n",
-         get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t{ router : "%s", ",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("gateway : "%s", label : "HNA" }\n",
+	       get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
 }
-static void
-json_print_1st(char * orig)
+static void json_print_1st(char *orig)
 {
-  printf("\t{ primary : "%s" }\n",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t{ primary : "%s" }\n",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
 }
-static void
-json_print_2nd(char * orig, char * from)
+static void json_print_2nd(char *orig, char *from)
 {
-  printf("\t{ secondary : "%s", ",
-         get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("\t{ secondary : "%s", ",
+	       get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)));
-  printf("of : "%s" }\n",
-         get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
+	printf("of : "%s" }\n",
+	       get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0)));
 }
-const struct funcs json_funcs =
-  { json_print_tq,
-    json_print_HNA,
-    json_print_1st,
-    json_print_2nd,
-    NULL,
-    NULL
+const struct funcs json_funcs = { json_print_tq,
+	json_print_HNA,
+	json_print_1st,
+	json_print_2nd,
+	NULL,
+	NULL
 };
-static FILE *
-open_vis(void)
+static FILE *open_vis(void)
 {
-  char full_path[500];
+	char full_path[500];
-  if (check_proc_dir("/proc") != EXIT_SUCCESS)
-    return NULL;
+	if (check_proc_dir("/proc") != EXIT_SUCCESS)
+		return NULL;
-  strncpy(full_path, PROC_ROOT_PATH, strlen(PROC_ROOT_PATH));
-  full_path[strlen(PROC_ROOT_PATH)] = '\0';
-  strncat(full_path, PROC_VIS_DATA, sizeof(full_path) - strlen(full_path));
+	strncpy(full_path, PROC_ROOT_PATH, strlen(PROC_ROOT_PATH));
+	full_path[strlen(PROC_ROOT_PATH)] = '\0';
+	strncat(full_path, PROC_VIS_DATA,
+		sizeof(full_path) - strlen(full_path));
-  return fopen(full_path, "r");
+	return fopen(full_path, "r");
 }
-static int
-format(const struct funcs *funcs)
+static int format(const struct funcs *funcs)
 {
-  size_t len = 0;
-  ssize_t read;
-  char * line = NULL;
-  char * orig, * from;
-  char * duplet;
-  char * line_save_ptr;
-  char * duplet_save_ptr;
-  char * endptr;
-  char * value;
-  long tq;
-  char * flag;
+	size_t len = 0;
+	ssize_t read;
+	char *line = NULL;
+	char *orig, *from;
+	char *duplet;
+	char *line_save_ptr;
+	char *duplet_save_ptr;
+	char *endptr;
+	char *value;
+	long tq;
+	char *flag;
-  FILE * fp = open_vis();
+	FILE *fp = open_vis();
-  if (!fp)
-    return EXIT_FAILURE;
+	if (!fp)
+		return EXIT_FAILURE;
-  if (funcs->print_header)
-    funcs->print_header();
+	if (funcs->print_header)
+		funcs->print_header();
-  while ((read = getline(&line, &len, fp)) != -1) {
-    /* First MAC address is the originator */
-    orig = strtok_r(line, ",", &line_save_ptr);
+	while ((read = getline(&line, &len, fp)) != -1) {
+		/* First MAC address is the originator */
+		orig = strtok_r(line, ",", &line_save_ptr);
-    duplet_save_ptr = line_save_ptr;
-    while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) {
-      flag = strtok(duplet, " ");
-      if (!flag)
-        continue;
-      if (!strcmp(flag, "TQ")) {
-        from = strtok(NULL, " ");
-        value = strtok(NULL, " ");
-        tq = strtoul(value, &endptr, 0);
-        funcs->print_tq(orig, from, tq);
-        continue;
-      }
-      if (!strcmp(flag, "HNA")) {
-        /* We have an HNA record */
-        if (!with_HNA)
-          continue;
-        from = strtok(NULL, " ");
-        funcs->print_HNA(orig, from);
-        continue;
-      }
-      if (!strcmp(flag, "SEC") && with_2nd) {
-        /* We found a secondary interface MAC address.*/
-        from = strtok(NULL, " ");
-        funcs->print_2nd(orig, from);
-      }
-      if (!strcmp(flag, "PRIMARY") && with_2nd) {
-        /* We found a primary interface MAC address.*/
-        funcs->print_1st(orig);
-      }
-    }
-  }
+		duplet_save_ptr = line_save_ptr;
+		while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) {
+			flag = strtok(duplet, " ");
+			if (!flag)
+				continue;
+			if (!strcmp(flag, "TQ")) {
+				from = strtok(NULL, " ");
+				value = strtok(NULL, " ");
+				tq = strtoul(value, &endptr, 0);
+				funcs->print_tq(orig, from, tq);
+				continue;
+			}
+			if (!strcmp(flag, "HNA")) {
+				/* We have an HNA record */
+				if (!with_HNA)
+					continue;
+				from = strtok(NULL, " ");
+				funcs->print_HNA(orig, from);
+				continue;
+			}
+			if (!strcmp(flag, "SEC") && with_2nd) {
+				/* We found a secondary interface MAC address. */
+				from = strtok(NULL, " ");
+				funcs->print_2nd(orig, from);
+			}
+			if (!strcmp(flag, "PRIMARY") && with_2nd) {
+				/* We found a primary interface MAC address. */
+				funcs->print_1st(orig);
+			}
+		}
+	}
-  if (funcs->print_footer)
-    funcs->print_footer();
+	if (funcs->print_footer)
+		funcs->print_footer();
-  if (line)
-    free(line);
-  return EXIT_SUCCESS;
+	if (line)
+		free(line);
+	return EXIT_SUCCESS;
 }
-int
-vis_data(int argc, char *argv[])
+int vis_data(int argc, char *argv[])
 {
-  bool dot = false;
-  bool json = false;
-  int c;
+	bool dot = false;
+	bool json = false;
+	int c;
-  if (argc <=1) {
-    usage();
-    return EXIT_FAILURE;
-  }
+	if (argc <= 1) {
+		usage();
+		return EXIT_FAILURE;
+	}
-  /* Do we know the requested format? */
-  if (strcmp(argv[1], "dot") == 0)
-    dot=true;
-  if (strcmp(argv[1], "json") == 0)
-    json=true;
+	/* Do we know the requested format? */
+	if (strcmp(argv[1], "dot") == 0)
+		dot = true;
+	if (strcmp(argv[1], "json") == 0)
+		json = true;
-  if (!dot && !json) {
-    usage();
-    return EXIT_FAILURE;
-  }
+	if (!dot && !json) {
+		usage();
+		return EXIT_FAILURE;
+	}
-  /* Move over the output format */
-  argc--;
-  argv++;
+	/* Move over the output format */
+	argc--;
+	argv++;
-  while (1) {
-    int option_index = 0;
-    static struct option long_options[] = {
-      {"no-HNA", 0, 0, 'h'},
-      {"no-2nd", 0, 0, '2'},
-      {"numbers", 0, 0, 'n'},
-      {0, 0, 0, 0}
-    };
+	while (1) {
+		int option_index = 0;
+		static struct option long_options[] = {
+			{"no-HNA", 0, 0, 'h'},
+			{"no-2nd", 0, 0, '2'},
+			{"numbers", 0, 0, 'n'},
+			{0, 0, 0, 0}
+		};
-    c = getopt_long(argc, argv, "h2n", long_options, &option_index);
-    if (c == -1)
-      break;
+		c = getopt_long(argc, argv, "h2n", long_options, &option_index);
+		if (c == -1)
+			break;
-    switch(c) {
-      case 'h':
-        with_HNA = false;
-        break;
-      case '2':
-        with_2nd = false;
-        break;
-      case 'n':
-        with_names = false;
-        break;
-      default:
-        usage();
-        return -1;
-    }
-  }
+		switch (c) {
+		case 'h':
+			with_HNA = false;
+			break;
+		case '2':
+			with_2nd = false;
+			break;
+		case 'n':
+			with_names = false;
+			break;
+		default:
+			usage();
+			return -1;
+		}
+	}
-  if (with_names)
-	  bat_hosts_init();
+	if (with_names)
+		bat_hosts_init();
-  if (dot)
-    return format(&dot_funcs);
+	if (dot)
+		return format(&dot_funcs);
-  if (json)
-    return format(&json_funcs);
+	if (json)
+		return format(&json_funcs);
-  return EXIT_FAILURE;
+	return EXIT_FAILURE;
 }

    