X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fnewick.c;h=09380da4f5764be086d85154d974f87f6232bdbc;hb=21426f51c5940cb37f3198a7853ef59743729b85;hp=d0a4f15e88abc94d3d2787322661ce5a72537f0a;hpb=d88302b4735b5b7c9132387090bb592d906fe1cb;p=ape.git

diff --git a/src/newick.c b/src/newick.c
index d0a4f15..09380da 100644
--- a/src/newick.c
+++ b/src/newick.c
@@ -1,4 +1,4 @@
-/* newick.c    2008-01-14 */
+/* newick.c    2012-02-09 */
 
 /* Copyright 2007-2008 Vincent Lefort */
 
@@ -69,8 +69,7 @@ node *decodeNewickSubtree(char *treeString, tree *T, int *uCount)
 	case(ReadOpenParenthesis):
 	  if('(' != treeString[0])
 	    {
-	      Rprintf("Error reading subtree.\n");
-	      exit(0);
+	      error("error reading subtree");
 	    }
 	  i++;
 	  state = ReadSubTree;
@@ -164,8 +163,7 @@ node *decodeNewickSubtree(char *treeString, tree *T, int *uCount)
 	    centerNode->middleEdge = thisEdge;
 	  else
 	    {
-	      Rprintf("Error: node %s has too many (>3) children.\n",centerNode->label);
-	      exit(0);
+	      error("node %s has too many (>3) children.", centerNode->label);
 	    }
 	  //sprintf(thisEdge->label,"E%d",edgeCount++);
 	  //snprintf(thisEdge->label,MAX_LABEL_LENGTH,"E%d",edgeCount++);
@@ -197,8 +195,7 @@ tree *readNewickString (char *str, int numLeaves)
 
   if ('(' != str[0])
     {
-      Rprintf("Error reading generated tree - does not start with '('.\n");
-      exit(0);
+      error("generated tree does not start with '('");
     }
   inputLength = strlen (str)+1;
   for(i = 0; i < inputLength; i++)
@@ -225,12 +222,11 @@ tree *readNewickString (char *str, int numLeaves)
 	}
       else if (parCount < 0)
 	{
-	  Rprintf("Error reading generated tree. Too many right parentheses.\n");
-	  exit(0);
+	  error("generated tree has too many right parentheses");
 	}
     }
   centerNode = decodeNewickSubtree (str, T, &uCount);
-  snprintf (centerNode->label, MAX_LABEL_LENGTH, rootLabel);
+  snprintf (centerNode->label, MAX_LABEL_LENGTH, "%s", rootLabel); /* added "%s" following Jos Kafer's suggestion (2010-11-23) */
   T->root = centerNode;
   return(T);
 }