aboutsummaryrefslogtreecommitdiffstats
path: root/src/android.c
diff options
context:
space:
mode:
authorPo Lu2023-10-27 18:44:15 +0800
committerPo Lu2023-10-27 18:44:15 +0800
commitbbd4385a631d0b1127a17919e767bbbb513e1dcc (patch)
tree4db7683dbdb2017cb6349e7f07529c33b84f8b45 /src/android.c
parentfe2761cf3e3f21a9c5a73686a8e21aceb13daa78 (diff)
downloademacs-bbd4385a631d0b1127a17919e767bbbb513e1dcc.tar.gz
emacs-bbd4385a631d0b1127a17919e767bbbb513e1dcc.zip
Substitute eassert for assert throughout Android code
* src/android.c (android_init_emacs_service) (android_init_emacs_pixmap, android_init_graphics_point) (android_init_emacs_drawable, android_init_emacs_window) (android_init_emacs_cursor, android_destroy_handle) (android_create_window, android_init_android_rect_class) (android_init_emacs_gc_class, android_begin_query): * src/androidselect.c (android_init_emacs_clipboard) (android_init_emacs_desktop_notification): * src/androidterm.c (getExtractedText) (android_get_surrounding_text_internal): * src/androidvfs.c (android_vfs_init): Replace assert with eassert.
Diffstat (limited to 'src/android.c')
-rw-r--r--src/android.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/android.c b/src/android.c
index 9f0e966a602..3344a773d5f 100644
--- a/src/android.c
+++ b/src/android.c
@@ -1531,7 +1531,7 @@ android_init_emacs_service (void)
1531 = (*android_java_env)->GetMethodID (android_java_env, \ 1531 = (*android_java_env)->GetMethodID (android_java_env, \
1532 service_class.class, \ 1532 service_class.class, \
1533 name, signature); \ 1533 name, signature); \
1534 assert (service_class.c_name); 1534 eassert (service_class.c_name);
1535 1535
1536 FIND_METHOD (fill_rectangle, "fillRectangle", 1536 FIND_METHOD (fill_rectangle, "fillRectangle",
1537 "(Lorg/gnu/emacs/EmacsDrawable;" 1537 "(Lorg/gnu/emacs/EmacsDrawable;"
@@ -1647,7 +1647,7 @@ android_init_emacs_pixmap (void)
1647 = (*android_java_env)->GetMethodID (android_java_env, \ 1647 = (*android_java_env)->GetMethodID (android_java_env, \
1648 pixmap_class.class, \ 1648 pixmap_class.class, \
1649 name, signature); \ 1649 name, signature); \
1650 assert (pixmap_class.c_name); 1650 eassert (pixmap_class.c_name);
1651 1651
1652 FIND_METHOD (constructor_mutable, "<init>", "(SIII)V"); 1652 FIND_METHOD (constructor_mutable, "<init>", "(SIII)V");
1653 1653
@@ -1678,7 +1678,7 @@ android_init_graphics_point (void)
1678 = (*android_java_env)->GetMethodID (android_java_env, \ 1678 = (*android_java_env)->GetMethodID (android_java_env, \
1679 point_class.class, \ 1679 point_class.class, \
1680 name, signature); \ 1680 name, signature); \
1681 assert (point_class.c_name); 1681 eassert (point_class.c_name);
1682 1682
1683 FIND_METHOD (constructor, "<init>", "(II)V"); 1683 FIND_METHOD (constructor, "<init>", "(II)V");
1684#undef FIND_METHOD 1684#undef FIND_METHOD
@@ -1708,7 +1708,7 @@ android_init_emacs_drawable (void)
1708 = (*android_java_env)->GetMethodID (android_java_env, \ 1708 = (*android_java_env)->GetMethodID (android_java_env, \
1709 drawable_class.class, \ 1709 drawable_class.class, \
1710 name, signature); \ 1710 name, signature); \
1711 assert (drawable_class.c_name); 1711 eassert (drawable_class.c_name);
1712 1712
1713 FIND_METHOD (get_bitmap, "getBitmap", "()Landroid/graphics/Bitmap;"); 1713 FIND_METHOD (get_bitmap, "getBitmap", "()Landroid/graphics/Bitmap;");
1714#undef FIND_METHOD 1714#undef FIND_METHOD
@@ -1738,7 +1738,7 @@ android_init_emacs_window (void)
1738 = (*android_java_env)->GetMethodID (android_java_env, \ 1738 = (*android_java_env)->GetMethodID (android_java_env, \
1739 window_class.class, \ 1739 window_class.class, \
1740 name, signature); \ 1740 name, signature); \
1741 assert (window_class.c_name); 1741 eassert (window_class.c_name);
1742 1742
1743 FIND_METHOD (swap_buffers, "swapBuffers", "()V"); 1743 FIND_METHOD (swap_buffers, "swapBuffers", "()V");
1744 FIND_METHOD (toggle_on_screen_keyboard, 1744 FIND_METHOD (toggle_on_screen_keyboard,
@@ -1798,7 +1798,7 @@ android_init_emacs_cursor (void)
1798 = (*android_java_env)->GetMethodID (android_java_env, \ 1798 = (*android_java_env)->GetMethodID (android_java_env, \
1799 cursor_class.class, \ 1799 cursor_class.class, \
1800 name, signature); \ 1800 name, signature); \
1801 assert (cursor_class.c_name); 1801 eassert (cursor_class.c_name);
1802 1802
1803 FIND_METHOD (constructor, "<init>", "(SI)V"); 1803 FIND_METHOD (constructor, "<init>", "(SI)V");
1804#undef FIND_METHOD 1804#undef FIND_METHOD
@@ -2695,12 +2695,12 @@ android_destroy_handle (android_handle handle)
2695 class 2695 class
2696 = (*android_java_env)->FindClass (android_java_env, 2696 = (*android_java_env)->FindClass (android_java_env,
2697 "org/gnu/emacs/EmacsHandleObject"); 2697 "org/gnu/emacs/EmacsHandleObject");
2698 assert (class != NULL); 2698 eassert (class != NULL);
2699 2699
2700 method 2700 method
2701 = (*android_java_env)->GetMethodID (android_java_env, class, 2701 = (*android_java_env)->GetMethodID (android_java_env, class,
2702 "destroyHandle", "()V"); 2702 "destroyHandle", "()V");
2703 assert (method != NULL); 2703 eassert (method != NULL);
2704 2704
2705 old = class; 2705 old = class;
2706 class 2706 class
@@ -2843,13 +2843,13 @@ android_create_window (android_window parent, int x, int y,
2843 { 2843 {
2844 class = (*android_java_env)->FindClass (android_java_env, 2844 class = (*android_java_env)->FindClass (android_java_env,
2845 "org/gnu/emacs/EmacsWindow"); 2845 "org/gnu/emacs/EmacsWindow");
2846 assert (class != NULL); 2846 eassert (class != NULL);
2847 2847
2848 constructor 2848 constructor
2849 = (*android_java_env)->GetMethodID (android_java_env, class, "<init>", 2849 = (*android_java_env)->GetMethodID (android_java_env, class, "<init>",
2850 "(SLorg/gnu/emacs/EmacsWindow;" 2850 "(SLorg/gnu/emacs/EmacsWindow;"
2851 "IIIIZ)V"); 2851 "IIIIZ)V");
2852 assert (constructor != NULL); 2852 eassert (constructor != NULL);
2853 2853
2854 old = class; 2854 old = class;
2855 class = (*android_java_env)->NewGlobalRef (android_java_env, class); 2855 class = (*android_java_env)->NewGlobalRef (android_java_env, class);
@@ -2925,12 +2925,12 @@ android_init_android_rect_class (void)
2925 android_rect_class 2925 android_rect_class
2926 = (*android_java_env)->FindClass (android_java_env, 2926 = (*android_java_env)->FindClass (android_java_env,
2927 "android/graphics/Rect"); 2927 "android/graphics/Rect");
2928 assert (android_rect_class); 2928 eassert (android_rect_class);
2929 2929
2930 android_rect_constructor 2930 android_rect_constructor
2931 = (*android_java_env)->GetMethodID (android_java_env, android_rect_class, 2931 = (*android_java_env)->GetMethodID (android_java_env, android_rect_class,
2932 "<init>", "(IIII)V"); 2932 "<init>", "(IIII)V");
2933 assert (emacs_gc_constructor); 2933 eassert (emacs_gc_constructor);
2934 2934
2935 old = android_rect_class; 2935 old = android_rect_class;
2936 android_rect_class 2936 android_rect_class
@@ -2952,19 +2952,19 @@ android_init_emacs_gc_class (void)
2952 emacs_gc_class 2952 emacs_gc_class
2953 = (*android_java_env)->FindClass (android_java_env, 2953 = (*android_java_env)->FindClass (android_java_env,
2954 "org/gnu/emacs/EmacsGC"); 2954 "org/gnu/emacs/EmacsGC");
2955 assert (emacs_gc_class); 2955 eassert (emacs_gc_class);
2956 2956
2957 emacs_gc_constructor 2957 emacs_gc_constructor
2958 = (*android_java_env)->GetMethodID (android_java_env, 2958 = (*android_java_env)->GetMethodID (android_java_env,
2959 emacs_gc_class, 2959 emacs_gc_class,
2960 "<init>", "(S)V"); 2960 "<init>", "(S)V");
2961 assert (emacs_gc_constructor); 2961 eassert (emacs_gc_constructor);
2962 2962
2963 emacs_gc_mark_dirty 2963 emacs_gc_mark_dirty
2964 = (*android_java_env)->GetMethodID (android_java_env, 2964 = (*android_java_env)->GetMethodID (android_java_env,
2965 emacs_gc_class, 2965 emacs_gc_class,
2966 "markDirty", "(Z)V"); 2966 "markDirty", "(Z)V");
2967 assert (emacs_gc_mark_dirty); 2967 eassert (emacs_gc_mark_dirty);
2968 2968
2969 old = emacs_gc_class; 2969 old = emacs_gc_class;
2970 emacs_gc_class 2970 emacs_gc_class
@@ -6667,7 +6667,7 @@ android_begin_query (void)
6667 if (old == 1) 6667 if (old == 1)
6668 { 6668 {
6669 /* Answer the query that is currently being made. */ 6669 /* Answer the query that is currently being made. */
6670 assert (android_query_function != NULL); 6670 eassert (android_query_function != NULL);
6671 android_answer_query (); 6671 android_answer_query ();
6672 } 6672 }
6673 6673