[open-jtalk-cvs] open_jtalk/src/njd Makefile.am, 1.3, 1.4 njd.c, 1.8, 1.9 njd.h, 1.8, 1.9 njd_node.c, 1.9, 1.10

[Keiichiro O. <ur...@us...>]

Update of /cvsroot/open-jtalk/open_jtalk/src/njd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14056/njd

Modified Files:
	Makefile.am njd.c njd.h njd_node.c 
Log Message:
remove some bugs

Index: njd.c
===================================================================
RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/njd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** njd.c	11 Dec 2013 06:33:06 -0000	1.8
--- njd.c	11 Dec 2014 05:12:15 -0000	1.9
***************
*** 5,9 ****
  /* ----------------------------------------------------------------- */
  /*                                                                   */
! /*  Copyright (c) 2008-2013  Nagoya Institute of Technology          */
  /*                           Department of Computer Science          */
  /*                                                                   */
--- 5,9 ----
  /* ----------------------------------------------------------------- */
  /*                                                                   */
! /*  Copyright (c) 2008-2014  Nagoya Institute of Technology          */
  /*                           Department of Computer Science          */
  /*                                                                   */
***************
*** 286,332 ****
  }
  
- void NJD_insert_node(NJD * njd, NJDNode * prev, NJDNode * next, NJDNode * node)
- {
-    NJDNode *tail;               /* for additional node sequence */
- 
-    if (prev == NULL && next == NULL) {
-       fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are not specified.\n");
-       exit(1);
-    }
-    tail = node;
-    while (tail->next != NULL)
-       tail = tail->next;
-    if (prev == NULL) {
-       if (next != njd->head) {
-          fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are wrong.\n");
-          exit(1);
-       }
-       tail->next = njd->head;
-       node->prev = NULL;
-       njd->head->prev = tail;
-       njd->head = node;
-    } else if (next == NULL) {
-       if (prev != njd->tail) {
-          fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are wrong.\n");
-          exit(1);
-       }
-       tail->next = NULL;
-       node->prev = njd->tail;
-       njd->tail->next = node;
-       njd->tail = tail;
-    } else {
-       if (prev->next != next || prev != next->prev) {
-          fprintf(stderr, "ERROR: NJD_insert_node() in njd.c: NJDNodes are wrong.\n");
-          exit(1);
-       }
-       prev->next = node;
-       node->prev = prev;
-       next->prev = tail;
-       tail->next = next;
-    }
- }
- 
  /* remove node and return next node */
! NJDNode *NJD_remove_node(NJD * njd, NJDNode * node)
  {
     NJDNode *next;
--- 286,291 ----
  }
  
  /* remove node and return next node */
! static NJDNode *NJD_remove_node(NJD * njd, NJDNode * node)
  {
     NJDNode *next;

Index: njd.h
===================================================================
RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/njd.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** njd.h	11 Dec 2013 06:33:06 -0000	1.8
--- njd.h	11 Dec 2014 05:12:15 -0000	1.9
***************
*** 5,9 ****
  /* ----------------------------------------------------------------- */
  /*                                                                   */
! /*  Copyright (c) 2008-2013  Nagoya Institute of Technology          */
  /*                           Department of Computer Science          */
  /*                                                                   */
--- 5,9 ----
  /* ----------------------------------------------------------------- */
  /*                                                                   */
! /*  Copyright (c) 2008-2014  Nagoya Institute of Technology          */
  /*                           Department of Computer Science          */
  /*                                                                   */
***************
*** 126,131 ****
  int NJD_get_size(NJD * njd);
  void NJD_push_node(NJD * njd, NJDNode * node);
- void NJD_insert_node(NJD * njd, NJDNode * prev, NJDNode * next, NJDNode * node);
- NJDNode *NJD_remove_node(NJD * njd, NJDNode * node);
  void NJD_remove_silent_node(NJD * njd);
  void NJD_print(NJD * njd);
--- 126,129 ----

Index: njd_node.c
===================================================================
RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/njd_node.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** njd_node.c	11 Dec 2013 06:33:06 -0000	1.9
--- njd_node.c	11 Dec 2014 05:12:15 -0000	1.10
***************
*** 5,9 ****
  /* ----------------------------------------------------------------- */
  /*                                                                   */
! /*  Copyright (c) 2008-2013  Nagoya Institute of Technology          */
  /*                           Department of Computer Science          */
  /*                                                                   */
--- 5,9 ----
  /* ----------------------------------------------------------------- */
  /*                                                                   */
! /*  Copyright (c) 2008-2014  Nagoya Institute of Technology          */
  /*                           Department of Computer Science          */
  /*                                                                   */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/open-jtalk/open_jtalk/src/njd/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	21 Dec 2012 04:37:42 -0000	1.3
--- Makefile.am	11 Dec 2014 05:12:15 -0000	1.4
***************
*** 6,10 ****
  MAINTAINERCLEANFILES = Makefile.in
  
! INCLUDES = @CHARSET@
  
  noinst_LIBRARIES = libnjd.a
--- 6,10 ----
  MAINTAINERCLEANFILES = Makefile.in
  
! AM_CPPFLAGS = @CHARSET@
  
  noinst_LIBRARIES = libnjd.a