diff options
| author |   Ned Ludd <solar@gentoo.org> | 2005-10-01 23:27:36 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2005-10-01 23:27:36 +0000 |
| commit | 0b8b9cb614e15765d0891d48cf2d57bde2353456 (patch) | |
| tree | 6d3131d3b1401b9c30497cb8c1450698855e61b5 | |
| parent | - touch up syntax in main.c; update qdepends man page (diff) | |
| download | portage-utils-0b8b9cb614e15765d0891d48cf2d57bde2353456.tar.gz portage-utils-0b8b9cb614e15765d0891d48cf2d57bde2353456.tar.bz2 portage-utils-0b8b9cb614e15765d0891d48cf2d57bde2353456.zip | |
- use warnf() function for error handling in dep_grow_tree() functionv0.1.5
| -rw-r--r-- | qdepends.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,7 +1,7 @@ /* * Copyright 2005 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.15 2005/10/01 21:55:58 solar Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.16 2005/10/01 23:27:36 solar Exp $ * * Copyright 2005 Ned Ludd - <solar@gentoo.org> * Copyright 2005 Mike Frysinger - <vapier@gentoo.org> @@ -145,7 +145,7 @@ void _dep_attach(dep_node *root, dep_node *attach_me, int type) dep_node *dep_grow_tree(char *depend) { signed long paren_balanced; - char *word, *ptr; + char *word, *ptr, *p; int curr_attach; dep_node *ret, *curr_node, *new_node; @@ -154,6 +154,9 @@ dep_node *dep_grow_tree(char *depend) curr_attach = _DEP_NEIGH; word = NULL; + p = strrchr(depend, '\n'); + if (p != NULL) *p = 0; + #define _maybe_consume_word(t) \ do { \ if (!word) break; \ @@ -202,7 +205,7 @@ dep_node *dep_grow_tree(char *depend) // FIXME: vapier // RDEPEND="|| ( ( foo bar ) baz )" if (curr_node->parent == NULL) { - fprintf(stderr, "FIXME: http://bugs.gentoo.org\a *DEP = %s", depend); + warnf("Invalid dep handling or syntax: %s", depend); break; } |