diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-11-05 18:17:23 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-11-05 18:17:23 +0000 |
commit | 493732167da19798f570416ee3e17e6419040cf9 (patch) | |
tree | 3052f4b7204efedc76ccde6afd624cb7dee1fc10 | |
parent | 6d59785024e321f8e868f1f9f34b3d8d8961e065 (diff) | |
download | rockbox-493732167da19798f570416ee3e17e6419040cf9.tar.gz rockbox-493732167da19798f570416ee3e17e6419040cf9.zip |
Android port: NewStringUTF() JNI call doesn't need freeing, these will get garbage collected.
Also use strncpy instead of snprintf.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28495 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/hosted/keyboard.c | 6 | ||||
-rw-r--r-- | apps/hosted/yesno.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/apps/hosted/keyboard.c b/apps/hosted/keyboard.c index 1993164ade..2b77825af0 100644 --- a/apps/hosted/keyboard.c +++ b/apps/hosted/keyboard.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <jni.h> | 24 | #include <jni.h> |
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | #include <stdio.h> | 26 | #include <stdio.h> |
27 | #include <string.h> | ||
27 | #include <system.h> | 28 | #include <system.h> |
28 | 29 | ||
29 | extern JNIEnv *env_ptr; | 30 | extern JNIEnv *env_ptr; |
@@ -75,13 +76,12 @@ int kbd_input(char* text, int buflen) | |||
75 | kbd_result); | 76 | kbd_result); |
76 | } while (!ret); | 77 | } while (!ret); |
77 | 78 | ||
78 | e->ReleaseStringUTFChars(env_ptr, str, NULL); | ||
79 | retchars = e->GetStringUTFChars(env_ptr, ret, 0); | 79 | retchars = e->GetStringUTFChars(env_ptr, ret, 0); |
80 | if (retchars[0]) | 80 | if (retchars[0]) |
81 | snprintf(text, buflen, retchars); | 81 | strncpy(text, retchars, buflen); |
82 | e->ReleaseStringUTFChars(env_ptr, ret, retchars); | 82 | e->ReleaseStringUTFChars(env_ptr, ret, retchars); |
83 | 83 | ||
84 | return retchars[0]?0:1; /* return 0 on success */ | 84 | return text[0] ? 0 : 1; /* return 0 on success */ |
85 | } | 85 | } |
86 | 86 | ||
87 | int load_kbd(unsigned char* filename) | 87 | int load_kbd(unsigned char* filename) |
diff --git a/apps/hosted/yesno.c b/apps/hosted/yesno.c index 1e05e193f7..9858e66438 100644 --- a/apps/hosted/yesno.c +++ b/apps/hosted/yesno.c | |||
@@ -95,8 +95,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, | |||
95 | jboolean ret; | 95 | jboolean ret; |
96 | 96 | ||
97 | e->CallVoidMethod(env_ptr, RockboxYesno_instance, yesno_func, message); | 97 | e->CallVoidMethod(env_ptr, RockboxYesno_instance, yesno_func, message); |
98 | e->ReleaseStringUTFChars(env_ptr, message, NULL); | ||
99 | |||
100 | 98 | ||
101 | do { | 99 | do { |
102 | sleep(HZ/10); | 100 | sleep(HZ/10); |