[svn-commits] kpfleming: trunk r946 - /trunk/menuselect.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Oct 14 17:29:18 CDT 2011
Author: kpfleming
Date: Fri Oct 14 17:29:15 2011
New Revision: 946
URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=946
Log:
Kill red blobs with fire! (eliminate trailing whitespace)
Modified:
trunk/menuselect.c
Modified: trunk/menuselect.c
URL: http://svnview.digium.com/svn/menuselect/trunk/menuselect.c?view=diff&rev=946&r1=945&r2=946
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Fri Oct 14 17:29:15 2011
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 2005 - 2010, Digium, Inc.
+ * Copyright (C) 2005 - 2010, Digium, Inc.
*
* Russell Bryant <russell at digium.com>
*
@@ -20,7 +20,7 @@
* \file
*
* \author Russell Bryant <russell at digium.com>
- *
+ *
* \brief A menu-driven system for Asterisk module selection
*/
@@ -46,7 +46,7 @@
/*!
We have to maintain a pointer to the root of the trees generated from reading
the build options XML files so that we can free it when we're done. We don't
- copy any of the information over from these trees. Our list is just a
+ copy any of the information over from these trees. Our list is just a
convenient mapping to the information contained in these lists with one
additional piece of information - whether the build option is enabled or not.
*/
@@ -625,7 +625,7 @@
mem->depsfailed = SOFT_FAILURE;
}
}
-
+
if (mem->depsfailed != old_failure) {
if ((mem->depsfailed == NO_FAILURE) && mem->was_defaulted) {
mem->enabled = !strcasecmp(mem->defaultenabled, "yes");
@@ -706,14 +706,14 @@
AST_LIST_TRAVERSE(&mem->conflicts, cnf, list) {
if (!cnf->member)
continue;
-
+
if (cnf->member->enabled) {
mem->conflictsfailed = SOFT_FAILURE;
print_debug("%d - Setting %s conflictsfailed to SOFT_FAILURE because %s is enabled\n", __LINE__, mem->name, cnf->member->name);
break;
}
}
-
+
if (mem->conflictsfailed != old_failure && mem->conflictsfailed != NO_FAILURE) {
mem->enabled = 0;
print_debug("Just set %s enabled to %d because of conflicts\n", mem->name, mem->enabled);
@@ -746,7 +746,7 @@
return -1;
}
- /* Build a dependency list from the file generated by configure */
+ /* Build a dependency list from the file generated by configure */
while (memset(buf, 0, sizeof(buf)), fgets(buf, sizeof(buf), f)) {
char *name, *cur, *prev, *p;
int val;
@@ -847,7 +847,7 @@
AST_LIST_TRAVERSE(&cat2->members, mem2, list) {
if (strcasecmp(mem2->name, dep->name))
continue;
-
+
dep->member = mem2;
break;
}
@@ -876,7 +876,7 @@
AST_LIST_TRAVERSE(&cat2->members, mem2, list) {
if (strcasecmp(mem2->name, use->name))
continue;
-
+
use->member = mem2;
break;
}
@@ -940,7 +940,7 @@
AST_LIST_TRAVERSE(&cat2->members, mem2, list) {
if (strcasecmp(mem2->name, cnf->name))
continue;
-
+
cnf->member = mem2;
break;
}
@@ -1163,14 +1163,14 @@
continue;
if (!mem->depsfailed && !mem->conflictsfailed) {
- mem->enabled = 1;
+ mem->enabled = 1;
print_debug("Just set %s enabled to %d in processing of previously failed deps\n", mem->name, mem->enabled);
mem->was_defaulted = 0;
}
-
+
break;
}
- break;
+ break;
}
if (!cat || !mem)
@@ -1212,20 +1212,20 @@
if (strlen_zero(parse))
continue;
- /* Grab the category name */
+ /* Grab the category name */
category = strsep(&parse, "=");
if (!parse) {
fprintf(stderr, "Invalid string in '%s' at line '%d'!\n", output_makeopts, lineno);
continue;
}
-
+
parse = skip_blanks(parse);
-
+
if (!strcasecmp(category, "MENUSELECT_DEPSFAILED")) {
process_prev_failed_deps(parse);
continue;
}
-
+
while ((member = strsep(&parse, " \n"))) {
member = skip_blanks(member);
if (strlen_zero(member))
@@ -1480,7 +1480,7 @@
AST_LIST_TRAVERSE(&mem->deps, dep, list)
fprintf(stderr, " --> Depends on: '%s'\n", dep->name);
if (!AST_LIST_EMPTY(&mem->deps))
- fprintf(stderr, " --> Dependencies Met: %s\n", mem->depsfailed ? "No" : "Yes");
+ fprintf(stderr, " --> Dependencies Met: %s\n", mem->depsfailed ? "No" : "Yes");
AST_LIST_TRAVERSE(&mem->conflicts, cnf, list)
fprintf(stderr, " --> Conflicts with: '%s'\n", cnf->name);
if (!AST_LIST_EMPTY(&mem->conflicts))
@@ -1506,7 +1506,7 @@
while ((cnf = AST_LIST_REMOVE_HEAD(&mem->conflicts, list)))
free(cnf);
while ((use = AST_LIST_REMOVE_HEAD(&mem->uses, list)))
- free(use);
+ free(use);
free(mem);
}
free(cat);
@@ -1557,7 +1557,7 @@
AST_LIST_TRAVERSE(&categories, cat, list)
count++;
- return count;
+ return count;
}
int count_members(struct category *cat)
@@ -1568,7 +1568,7 @@
AST_LIST_TRAVERSE(&cat->members, mem, list)
count++;
- return count;
+ return count;
}
static void print_sanity_dep_header(struct dep_file *dep_file, unsigned int *flag)
@@ -1700,7 +1700,7 @@
if (mem->conflictsfailed == HARD_FAILURE)
continue;
-
+
if (!strcasecmp(mem->defaultenabled, "yes")) {
mem->enabled = 1;
mem->was_defaulted = 1;
@@ -1708,7 +1708,7 @@
mem->enabled = 0;
mem->was_defaulted = 1;
} else
- fprintf(stderr, "Invalid defaultenabled value for '%s' in category '%s'\n", mem->name, cat->name);
+ fprintf(stderr, "Invalid defaultenabled value for '%s' in category '%s'\n", mem->name, cat->name);
}
}
@@ -1761,7 +1761,7 @@
const char *list_group = NULL;
unsigned int x;
static struct option long_options[] = {
- /*
+ /*
* The --check-deps option is used to ask this application to check to
* see if that an existing menuselect.makeopts file contains all of the
* modules that have dependencies that have not been met. If this
More information about the svn-commits
mailing list