Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix ntohl; allow null Strings

Browse source
This commit is contained in:
ehouse 2010-01-09 17:10:59 +00:00
parent 9761596e6e
commit 278b815a3e
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
xwords4/android/andutils.c
View file

@ -1,3 +1,5 @@
/* -*-mode: C; compile-command: "cd XWords4; ../scripts/ndkbuild.sh"; -*- */
#include "andutils.h" #include "andutils.h"
#include "comtypes.h" #include "comtypes.h"
@ -12,45 +14,43 @@ and_assert( const char* test, int line, const char* file, const char* func )
} }
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
XP_U32 XP_U32
and_ntohl(XP_U32 l) and_ntohl(XP_U32 ll)
{ {
XP_U32 result = 0L; XP_U32 result = 0L;
result |= l << 24; int ii;
result |= (l << 16) & 0x00FF0000; for ( ii = 0; ii < 4; ++ii ) {
result |= (l >> 16) & 0x0000FF00; result <<= 8;
result |= (l >> 24); result |= ll & 0x000000FF;
ll >>= 8;
XP_LOGF( "%s: %lx -> %lx", __func__, l, result ); }
return result; return result;
} }
XP_U16 XP_U16
and_ntohs(XP_U16 s) and_ntohs( XP_U16 ss )
{ {
XP_U16 result; XP_U16 result;
result = s << 8; result = ss << 8;
result |= s >> 8; result |= ss >> 8;
XP_LOGF( "%s: %x -> %x", __func__, s, result );
return result; return result;
} }
XP_U32 XP_U32
and_htonl(XP_U32 l) and_htonl( XP_U32 ll )
{ {
return and_ntohl( ll );
} }
XP_U16 XP_U16
and_htons(XP_U16 s) and_htons( XP_U16 ss )
{ {
return and_ntohs( s ); return and_ntohs( ss );
} }
#else
error error error
#endif #endif
bool bool
@ -121,17 +121,18 @@ getString( JNIEnv* env, jobject obj, const char* name, XP_UCHAR* buf,
jfieldID fid = (*env)->GetFieldID( env, cls, name, "Ljava/lang/String;" ); jfieldID fid = (*env)->GetFieldID( env, cls, name, "Ljava/lang/String;" );
XP_ASSERT( !!fid ); XP_ASSERT( !!fid );
jstring jstr = (*env)->GetObjectField( env, obj, fid ); jstring jstr = (*env)->GetObjectField( env, obj, fid );
XP_ASSERT( !!jstr ); jsize len = 0;
if ( !!jstr ) { /* might be null */
jsize len = (*env)->GetStringUTFLength( env, jstr ); len = (*env)->GetStringUTFLength( env, jstr );
XP_ASSERT( len < bufLen ); XP_ASSERT( len < bufLen );
const char* chars = (*env)->GetStringUTFChars( env, jstr, NULL ); const char* chars = (*env)->GetStringUTFChars( env, jstr, NULL );
XP_MEMCPY( buf, chars, len ); XP_MEMCPY( buf, chars, len );
(*env)->ReleaseStringUTFChars( env, jstr, chars ); (*env)->ReleaseStringUTFChars( env, jstr, chars );
(*env)->DeleteLocalRef( env, jstr );
}
buf[len] = '\0'; buf[len] = '\0';
(*env)->DeleteLocalRef( env, cls ); (*env)->DeleteLocalRef( env, cls );
(*env)->DeleteLocalRef( env, jstr );
} }
bool bool