From 188874e289ffb83fd6344d7efe2680c5ad365fd3 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 28 Jul 2019 11:17:51 +0100 Subject: [PATCH] examples - use putenv, not setenv for porting reasons putenv is more portable than setenv, so usethat instead. this nukes warnings on windows as evil is meant to go private and you thus have no setenv anymore. --- src/examples/edje/edje-text.c | 15 +++++++++++++-- src/examples/evas/evas-3d-blending.c | 2 +- src/examples/evas/evas-3d-cube.c | 2 +- src/examples/evas/evas-3d-cube2.c | 2 +- src/examples/evas/evas-3d-eet.c | 2 +- src/examples/evas/evas-3d-fog.c | 2 +- src/examples/evas/evas-3d-frustum.c | 2 +- src/examples/evas/evas-3d-hull.c | 2 +- src/examples/evas/evas-3d-md2.c | 2 +- src/examples/evas/evas-3d-mmap-set.c | 2 +- src/examples/evas/evas-3d-obj.c | 2 +- src/examples/evas/evas-3d-parallax-occlusion.c | 2 +- src/examples/evas/evas-3d-pick.c | 2 +- src/examples/evas/evas-3d-ply.c | 2 +- src/examples/evas/evas-3d-proxy.c | 2 +- src/examples/evas/evas-3d-shadows.c | 2 +- src/examples/evas/evas-3d-static-lod.c | 2 +- src/examples/evas/evas-vg-batman.c | 2 +- src/examples/evas/evas-vg-json.c | 2 +- 19 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/examples/edje/edje-text.c b/src/examples/edje/edje-text.c index 2f4d745aa0..45fb340feb 100644 --- a/src/examples/edje/edje-text.c +++ b/src/examples/edje/edje-text.c @@ -77,9 +77,20 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o, void static void _on_mouse_down_text(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED) { + static char *env_lang_str = NULL; + char *s; + lang_idx = (lang_idx + 1) % (sizeof (lang)/ sizeof (lang[0])); fprintf(stderr, "Setting lang to '%s'\n", lang[lang_idx]); - setenv("LANGUAGE", lang[lang_idx], 1); + s = malloc(10 + strlen(lang[lang_idx])); + if (s) + { + strcpy(s, "LANGUAGE="); + strcpy(s + 9, lang[lang_idx]); + putenv(s); + if (env_lang_str) free(env_lang_str); + env_lang_str = s; + } edje_language_set(lang[lang_idx]); } int @@ -122,7 +133,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED) evas_object_move(edje_obj, 0, 20); evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); evas_object_show(edje_obj); - setenv("LANGUAGE", "en_IN", 1); + putenv("LANGUAGE=en_IN"); edje_object_language_set(edje_obj, "en_IN"); edje_object_text_change_cb_set(edje_obj, _on_text_change, NULL); edje_object_part_text_set(edje_obj, "part_two", "Click here"); diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c index 47271ff460..066961af72 100644 --- a/src/examples/evas/evas-3d-blending.c +++ b/src/examples/evas/evas-3d-blending.c @@ -266,7 +266,7 @@ main(void) if (!ecore_evas_init()) return 0; - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); ecore_evas = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); if (!ecore_evas) return 0; diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index 3fba86a147..50c3034342 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -218,7 +218,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); Scene_Data data; diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index 493cea98ce..026b90a5a0 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -213,7 +213,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); Scene_Data data; diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index 5ecd79e350..0272de7db2 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -98,7 +98,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index 8bcd51b94e..ec27d632c2 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -190,7 +190,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); Scene_Data data; Ecore_Animator *anim; diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index 6aacecc825..2d693fc83a 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -405,7 +405,7 @@ main(void) if (!ecore_evas_init()) return 0; - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); ecore_evas = ecore_evas_new("opengl_x11", 0, 0, WIDTH, HEIGHT, NULL); if (!ecore_evas) return 0; diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index 6ca12837dc..a5c39752d2 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -412,7 +412,7 @@ main(void) Scene_Data data; // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 4c93b54ec0..a4edb28833 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -75,7 +75,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index df8bdbdd4d..7da515aa61 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -165,7 +165,7 @@ main(void) Eina_File *obj_file, *ply_file, *eet_file, *md2_file; // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index 6bf668ba09..1034b6befc 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -143,7 +143,7 @@ main(void) char buffer[PATH_MAX], full_file_path[PATH_MAX + 4]; // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index 65d1880559..e3a69a606b 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -217,7 +217,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); Scene_Data data; diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index 5ed8067dc3..600220f955 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -101,7 +101,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c index ba0b912d0b..3d8693e90a 100644 --- a/src/examples/evas/evas-3d-ply.c +++ b/src/examples/evas/evas-3d-ply.c @@ -114,7 +114,7 @@ main(void) } // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 1a671f811d..8c88143a47 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -201,7 +201,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); Scene_Data data; diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index eaa2f02f55..315fda70cd 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -626,7 +626,7 @@ main(void) Eina_List *nodes1 = NULL, *nodes2 = NULL; // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); if (!ecore_evas_init()) return 0; ecore_evas = ecore_evas_new(NULL, 10, 10, WIDTH, HEIGHT, NULL); diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c index 3b08380f1c..f4477289c7 100644 --- a/src/examples/evas/evas-3d-static-lod.c +++ b/src/examples/evas/evas-3d-static-lod.c @@ -235,7 +235,7 @@ int main(void) { // Unless Evas 3D supports Software renderer, we force use of the gl backend. - setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + putenv("ECORE_EVAS_ENGINE=opengl_x11"); Scene_Data data; diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c index 8625366962..72bdd6c4fe 100644 --- a/src/examples/evas/evas-vg-batman.c +++ b/src/examples/evas/evas-vg-batman.c @@ -104,7 +104,7 @@ main(void) if (!ecore_evas_init()) return -1; - //setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); + //putenv("ECORE_EVAS_ENGINE=opengl_x11"); ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); if (!ee) return -1; diff --git a/src/examples/evas/evas-vg-json.c b/src/examples/evas/evas-vg-json.c index d0176dbd72..a6c0969381 100644 --- a/src/examples/evas/evas-vg-json.c +++ b/src/examples/evas/evas-vg-json.c @@ -59,7 +59,7 @@ int main(void) { //Cairo backend is not supported. - setenv("ECTOR_BACKEND", "default", 1); + putenv("ECTOR_BACKEND=default"); if (!ecore_evas_init()) return EXIT_FAILURE;