rpms/ochusha/devel ochusha-head-g++44-02.diff, NONE, 1.1 ochusha.spec, 1.95, 1.96

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28512

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-head-g++44-02.diff 
Log Message:
another g++44 patch

ochusha-head-g++44-02.diff:

--- NEW FILE ochusha-head-g++44-02.diff ---
Index: libochusha/bbs_2ch_utils.cc
===================================================================
RCS file: /cvsroot/ochusha/ochusha/libochusha/bbs_2ch_utils.cc,v
retrieving revision 1.59
diff -u -r1.59 bbs_2ch_utils.cc
--- libochusha/bbs_2ch_utils.cc	1 Jan 2009 07:46:43 -0000	1.59
+++ libochusha/bbs_2ch_utils.cc	20 Feb 2009 17:19:29 -0000
@@ -190,7 +190,7 @@
       char id_buf[PATH_MAX];
 
       while (rest_len > 0
-	     && (eol_pos = static_cast<char *>(memchr(cur_pos, '\n',
+	     && (eol_pos = static_cast<const char *>(memchr(cur_pos, '\n',
 						      rest_len))) != NULL)
 	{
 	  if (regexp.match(cur_pos, eol_pos - cur_pos))
@@ -731,7 +731,7 @@
       for (i = 0; i < 3; i++)
 	{
 	  tmp_pos
-	    = static_cast<char *>(memchr(cur_pos, ',',
+	    = static_cast<const char *>(memchr(cur_pos, ',',
 					 tmp_len - (cur_pos - start_pos)));
 	  if (tmp_pos != NULL)
 	    {
@@ -1642,7 +1642,7 @@
     char *session_id = NULL;
     if (len > 0)
       {
-	const char *sid = strstr(result_buf, "SESSION-ID=");
+	char *sid = strstr(result_buf, "SESSION-ID=");
 	if (sid != NULL)
 	  {
 	    sid += 11;	// "SESSION-ID="¤òÆɤßÈô¤Ð¤¹
Index: libochusha/bbs_jbbs_utils.cc
===================================================================
RCS file: /cvsroot/ochusha/ochusha/libochusha/bbs_jbbs_utils.cc,v
retrieving revision 1.33
diff -u -r1.33 bbs_jbbs_utils.cc
--- libochusha/bbs_jbbs_utils.cc	1 Jan 2009 07:46:43 -0000	1.33
+++ libochusha/bbs_jbbs_utils.cc	20 Feb 2009 17:19:29 -0000
@@ -518,15 +518,16 @@
 		pending_buffer.get_string_length());
   buffer.append(data, length);
 
-  const char *buf_top = buffer.get_string();
+  // buf_top¤Ï¾å½ñ¤­¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ç¡¢buf_top¤Ïconst char *¤Ë½ÐÍè¤Ê¤¤
+  char *buf_top = strdup(buffer.get_string());
   size_t buf_len = buffer.get_string_length();
 
-  const char *buf_pos = buf_top;
+  char *buf_pos = buf_top;
   size_t rest_len = buf_len;
   unsigned int res_num = cursor->get_next_res_num();
   if (res_num == 1 && title_text == NULL)
     {
-      const char *tmp_pos;
+      char *tmp_pos;
       while ((tmp_pos = static_cast<char *>(memchr(buf_pos, '\n',
 						   rest_len))) != NULL)
 	{
@@ -579,6 +580,7 @@
 	    {
 	      if (!two_line)
 		{
+		// ¼¡¤Î¹Ô¤Ç tmp_pos¡Ê¤Ä¤Þ¤êbuf_top¡Ë¤¬¾å½ñ¤­¤µ¤ì¤ë
 		  *tmp_pos = ' ';	// ¼¡¤Î¹Ô¤È·Ò¤¤¤ÇºÆÅÙÄ©Àï
 		  two_line = true;
 		  continue;
@@ -601,6 +603,7 @@
   pending_buffer.clear();
   pending_buffer.append(buf_pos, rest_len);
 
+  free(buf_top);
   return true;
 }
 
Index: libochusha/html_utils.cc
===================================================================
RCS file: /cvsroot/ochusha/ochusha/libochusha/html_utils.cc,v
retrieving revision 1.26
diff -u -r1.26 html_utils.cc
--- libochusha/html_utils.cc	1 Jan 2009 07:46:43 -0000	1.26
+++ libochusha/html_utils.cc	20 Feb 2009 17:19:29 -0000
@@ -458,7 +458,7 @@
 
 	  if (quot == '\'' || quot == '"')
 	    {
-	      tmp_pos = static_cast<char *>(memchr(++cur_pos, quot, --len));
+	      tmp_pos = static_cast<const char *>(memchr(++cur_pos, quot, --len));
 	      if (tmp_pos == NULL)
 		{
 		  cur_pos = NULL;


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ochusha.spec	20 Feb 2009 16:13:24 -0000	1.95
+++ ochusha.spec	20 Feb 2009 17:24:22 -0000	1.96
@@ -42,6 +42,7 @@
 %endif
 Source10:	ochusha-prefs-gtkrc
 Source11:	ochusha.sh
+Patch10:	ochusha-head-g++44-02.diff
 License:	BSD
 Group:		Applications/Internet
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,6 +75,7 @@
 %else
 %setup -q
 %endif
+%patch10 -p0 -b .g++
 
 # Icon path fix
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48|' ochusha/ochusha.desktop.in
@@ -216,8 +218,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sat Feb 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+* Sat Feb 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.0.1-0.4.cvs20090221T0000
 - Update to the latest CVS
+- And another patch to compile with g++44
 
 * Thu Feb  5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.0.1-0.3.cvs20090106T1430
 - Patch to compile with g++44