You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/10/11 14:21:57 UTC
svn commit: r583798 - in /harmony/enhanced/classlib/trunk/modules: luni/
luni/src/main/native/include/shared/ portlib/
portlib/src/main/native/include/shared/
portlib/src/main/native/port/shared/ portlib/src/main/native/port/unix/
portlib/src/main/nati...
Author: hindessm
Date: Thu Oct 11 05:21:56 2007
New Revision: 583798
URL: http://svn.apache.org/viewvc?rev=583798&view=rev
Log:
Move header files for code in portlib/.../common from luni to portlib.
strhelp.h wasn't being cleaned in the old location fix that in the new
location.
Create header files for utf8{en,de}code.h to make things a little more
consistent.
Use the new header files rather than just ad hoc declarations.
Added:
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/exceptions.h
- copied unchanged from r583751, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/exceptions.h
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/iohelp.h
- copied unchanged from r583774, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/libglob.h
- copied unchanged from r583751, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/libglob.h
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/strhelp.h
- copied unchanged from r583751, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/strhelp.h
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8decode.h (with props)
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8encode.h (with props)
Removed:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/exceptions.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/libglob.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/strhelp.h
Modified:
harmony/enhanced/classlib/trunk/modules/luni/build.xml
harmony/enhanced/classlib/trunk/modules/portlib/build.xml
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hystr.c
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyfiletext.c
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyfiletext.c
harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/shared/hyfile.c
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=583798&r1=583797&r2=583798&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Oct 11 05:21:56 2007
@@ -53,10 +53,6 @@
<include name="hyvmls.h" />
<include name="hysocket.h" />
<include name="gp.h" />
- <include name="iohelp.h" />
- <include name="exceptions.h" />
- <include name="libglob.h" />
- <include name="strhelp.h" />
<include name="fdlibm.h" />
<include name="hymagic.h" />
<include name="jsig.h" />
@@ -216,9 +212,6 @@
<include name="jclprots.h" />
<include name="hysocket.h" />
<include name="gp.h" />
- <include name="iohelp.h" />
- <include name="exceptions.h" />
- <include name="libglob.h" />
<include name="fdlibm.h" />
<include name="hymagic.h" />
<include name="jsig.h" />
Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=583798&r1=583797&r2=583798&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Thu Oct 11 05:21:56 2007
@@ -60,6 +60,12 @@
<include name="hycomp.h" />
<include name="hyporterror.h" />
<include name="hypool.h" />
+ <include name="exceptions.h" />
+ <include name="iohelp.h" />
+ <include name="libglob.h" />
+ <include name="strhelp.h" />
+ <include name="utf8decode.h" />
+ <include name="utf8encode.h" />
</fileset>
</copy>
<copy todir="${hy.hdk}/include" overwrite="yes">
@@ -174,6 +180,12 @@
<include name="hysock.h" />
<include name="hyportpg.h" />
<include name="hypool.h" />
+ <include name="exceptions.h" />
+ <include name="iohelp.h" />
+ <include name="libglob.h" />
+ <include name="strhelp.h" />
+ <include name="utf8decode.h" />
+ <include name="utf8encode.h" />
</fileset>
</delete>
</target>
Added: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8decode.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8decode.h?rev=583798&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8decode.h (added)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8decode.h Thu Oct 11 05:21:56 2007
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(utf8decode_h)
+#define utf8decode_h
+U_32 decodeUTF8CharN (const U_8 * input, U_16 * result, U_32 bytesRemaining);
+U_32 decodeUTF8Char (const U_8 * input, U_16 * result);
+#endif /* utf8decode_h */
Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8decode.h
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8encode.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8encode.h?rev=583798&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8encode.h (added)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8encode.h Thu Oct 11 05:21:56 2007
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(utf8encode_h)
+#define utf8encode_h
+U_32 encodeUTF8CharN (UDATA unicode, U_8 * result, U_32 bytesRemaining);
+U_32 encodeUTF8Char (UDATA unicode, U_8 * result);
+#endif /* utf8encode_h */
Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/utf8encode.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hystr.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hystr.c?rev=583798&r1=583797&r2=583798&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hystr.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/shared/hystr.c Thu Oct 11 05:21:56 2007
@@ -29,6 +29,7 @@
#include "hycomp.h"
#include "hyport.h"
+#include "utf8encode.h"
#define HYFTYPE_U64 1
#define HYFTYPE_U32 2
@@ -80,8 +81,6 @@
static const char digits_dec[] = "0123456789";
static const char digits_hex_lower[] = "0123456789abcdef";
static const char digits_hex_upper[] = "0123456789ABCDEF";
-
-extern U_32 encodeUTF8Char (UDATA unicode, U_8 * result);
static const char *parseTagChar (const char *format, HyFormatData * result);
static void readValues (struct HyPortLibrary *portLibrary,
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyfiletext.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyfiletext.c?rev=583798&r1=583797&r2=583798&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyfiletext.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyfiletext.c Thu Oct 11 05:21:56 2007
@@ -62,8 +62,7 @@
#endif /* HYVM_USE_ICONV (autogen) */
#if (defined(HYVM_USE_WCTOMB))
-U_32 decodeUTF8CharN (const U_8 * input, U_16 * result, U_32 bytesRemaining);
-U_32 decodeUTF8Char (const U_8 * input, U_16 * result);
+#include "utf8decode.h"
#endif
#if (defined(HYVM_USE_WCTOMB))
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyfiletext.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyfiletext.c?rev=583798&r1=583797&r2=583798&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyfiletext.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/hyfiletext.c Thu Oct 11 05:21:56 2007
@@ -25,10 +25,7 @@
#include <windows.h>
#include "hyport.h"
-
-#define CDEV_CURRENT_FUNCTION _prototypes_private
-U_32 decodeUTF8CharN (const U_8 * input, U_16 * result, U_32 bytesRemaining);
-#undef CDEV_CURRENT_FUNCTION
+#include "utf8decode.h"
#define CDEV_CURRENT_FUNCTION hybuf_write_text
/**
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/shared/hyfile.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/shared/hyfile.c?rev=583798&r1=583797&r2=583798&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/shared/hyfile.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/shared/hyfile.c Thu Oct 11 05:21:56 2007
@@ -23,10 +23,8 @@
#include "hycomp.h"
#include "hyport.h"
#include "hycunit.h"
+#include "utf8encode.h"
-#define CDEV_CURRENT_FUNCTION _prototypes_private
-encodeUTF8CharN (UDATA unicode, U_8 * result, U_32 bytesRemaining);
-#undef CDEV_CURRENT_FUNCTION
void cleanup(HyPortLibrary hyportLibrary);
void generateAbsoluteFilePath(struct HyPortLibrary *hyportLibrary,char *dist , char *fileName);
void forVprintfTest(struct HyPortLibrary *hyportLibrary,IDATA fd,char* format,...);