[Bf-blender-cvs] [df9597cfba7] master: Cleanup: use const for datatoc declarations
Campbell Barton
noreply at git.blender.org
Wed Jun 30 08:44:09 CEST 2021
Commit: df9597cfba78deb40009553ab9dcf09c21edd434
Author: Campbell Barton
Date: Wed Jun 30 16:32:33 2021 +1000
Branches: master
https://developer.blender.org/rBdf9597cfba78deb40009553ab9dcf09c21edd434
Cleanup: use const for datatoc declarations
===================================================================
M intern/ghost/test/multitest/MultiTest.c
M source/blender/blenkernel/BKE_font.h
M source/blender/blenkernel/intern/font.c
M source/blender/editors/include/ED_datafiles.h
===================================================================
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 3b424f1ca89..ccbbbceb5b6 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -60,7 +60,7 @@
#include "GPU_init_exit.h"
extern int datatoc_bfont_ttf_size;
-extern char datatoc_bfont_ttf[];
+extern char const datatoc_bfont_ttf[];
typedef struct _LoggerWindow LoggerWindow;
typedef struct _MultiTestApp MultiTestApp;
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h
index b23ccbe25ff..522d3843bb2 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -66,8 +66,8 @@ typedef struct EditFont {
} EditFont;
-bool BKE_vfont_is_builtin(struct VFont *vfont);
-void BKE_vfont_builtin_register(void *mem, int size);
+bool BKE_vfont_is_builtin(const struct VFont *vfont);
+void BKE_vfont_builtin_register(const void *mem, int size);
void BKE_vfont_free_data(struct VFont *vfont);
struct VFont *BKE_vfont_builtin_get(void);
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 95de9a9d636..8bb2c401b03 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -216,15 +216,15 @@ void BKE_vfont_free_data(struct VFont *vfont)
}
}
-static void *builtin_font_data = NULL;
+static const void *builtin_font_data = NULL;
static int builtin_font_size = 0;
-bool BKE_vfont_is_builtin(struct VFont *vfont)
+bool BKE_vfont_is_builtin(const struct VFont *vfont)
{
return STREQ(vfont->filepath, FO_BUILTIN_NAME);
}
-void BKE_vfont_builtin_register(void *mem, int size)
+void BKE_vfont_builtin_register(const void *mem, int size)
{
builtin_font_data = mem;
builtin_font_size = size;
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index 40b0a8d96b1..59e0e014933 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -30,275 +30,275 @@ extern "C" {
/* Datafiles embedded in Blender */
extern int datatoc_startup_blend_size;
-extern char datatoc_startup_blend[];
+extern const char datatoc_startup_blend[];
extern int datatoc_preview_blend_size;
-extern char datatoc_preview_blend[];
+extern const char datatoc_preview_blend[];
extern int datatoc_preview_grease_pencil_blend_size;
-extern char datatoc_preview_grease_pencil_blend[];
+extern const char datatoc_preview_grease_pencil_blend[];
extern int datatoc_blender_icons16_png_size;
-extern char datatoc_blender_icons16_png[];
+extern const char datatoc_blender_icons16_png[];
extern int datatoc_blender_icons32_png_size;
-extern char datatoc_blender_icons32_png[];
+extern const char datatoc_blender_icons32_png[];
extern int datatoc_prvicons_png_size;
-extern char datatoc_prvicons_png[];
+extern const char datatoc_prvicons_png[];
extern int datatoc_alert_icons_png_size;
-extern char datatoc_alert_icons_png[];
+extern const char datatoc_alert_icons_png[];
extern int datatoc_blender_logo_png_size;
-extern char datatoc_blender_logo_png[];
+extern const char datatoc_blender_logo_png[];
extern int datatoc_splash_png_size;
-extern char datatoc_splash_png[];
+extern const char datatoc_splash_png[];
extern int datatoc_bfont_pfb_size;
-extern char datatoc_bfont_pfb[];
+extern const char datatoc_bfont_pfb[];
/* Brush icon datafiles */
/* TODO: this could be simplified by putting all
* the brush icons in one file */
extern int datatoc_add_png_size;
-extern char datatoc_add_png[];
+extern const char datatoc_add_png[];
extern int datatoc_blob_png_size;
-extern char datatoc_blob_png[];
+extern const char datatoc_blob_png[];
extern int datatoc_blur_png_size;
-extern char datatoc_blur_png[];
+extern const char datatoc_blur_png[];
extern int datatoc_clay_png_size;
-extern char datatoc_clay_png[];
+extern const char datatoc_clay_png[];
extern int datatoc_claystrips_png_size;
-extern char datatoc_claystrips_png[];
+extern const char datatoc_claystrips_png[];
extern int datatoc_clone_png_size;
-extern char datatoc_clone_png[];
+extern const char datatoc_clone_png[];
extern int datatoc_crease_png_size;
-extern char datatoc_crease_png[];
+extern const char datatoc_crease_png[];
extern int datatoc_darken_png_size;
-extern char datatoc_darken_png[];
+extern const char datatoc_darken_png[];
extern int datatoc_draw_png_size;
-extern char datatoc_draw_png[];
+extern const char datatoc_draw_png[];
extern int datatoc_fill_png_size;
-extern char datatoc_fill_png[];
+extern const char datatoc_fill_png[];
extern int datatoc_flatten_png_size;
-extern char datatoc_flatten_png[];
+extern const char datatoc_flatten_png[];
extern int datatoc_grab_png_size;
-extern char datatoc_grab_png[];
+extern const char datatoc_grab_png[];
extern int datatoc_inflate_png_size;
-extern char datatoc_inflate_png[];
+extern const char datatoc_inflate_png[];
extern int datatoc_layer_png_size;
-extern char datatoc_layer_png[];
+extern const char datatoc_layer_png[];
extern int datatoc_lighten_png_size;
-extern char datatoc_lighten_png[];
+extern const char datatoc_lighten_png[];
extern int datatoc_mask_png_size;
-extern char datatoc_mask_png[];
+extern const char datatoc_mask_png[];
extern int datatoc_mix_png_size;
-extern char datatoc_mix_png[];
+extern const char datatoc_mix_png[];
extern int datatoc_multiply_png_size;
-extern char datatoc_multiply_png[];
+extern const char datatoc_multiply_png[];
extern int datatoc_nudge_png_size;
-extern char datatoc_nudge_png[];
+extern const char datatoc_nudge_png[];
extern int datatoc_pinch_png_size;
-extern char datatoc_pinch_png[];
+extern const char datatoc_pinch_png[];
extern int datatoc_scrape_png_size;
-extern char datatoc_scrape_png[];
+extern const char datatoc_scrape_png[];
extern int datatoc_smear_png_size;
-extern char datatoc_smear_png[];
+extern const char datatoc_smear_png[];
extern int datatoc_smooth_png_size;
-extern char datatoc_smooth_png[];
+extern const char datatoc_smooth_png[];
extern int datatoc_snake_hook_png_size;
-extern char datatoc_snake_hook_png[];
+extern const char datatoc_snake_hook_png[];
extern int datatoc_soften_png_size;
-extern char datatoc_soften_png[];
+extern const char datatoc_soften_png[];
extern int datatoc_subtract_png_size;
-extern char datatoc_subtract_png[];
+extern const char datatoc_subtract_png[];
extern int datatoc_texdraw_png_size;
-extern char datatoc_texdraw_png[];
+extern const char datatoc_texdraw_png[];
extern int datatoc_texfill_png_size;
-extern char datatoc_texfill_png[];
+extern const char datatoc_texfill_png[];
extern int datatoc_texmask_png_size;
-extern char datatoc_texmask_png[];
+extern const char datatoc_texmask_png[];
extern int datatoc_thumb_png_size;
-extern char datatoc_thumb_png[];
+extern const char datatoc_thumb_png[];
extern int datatoc_twist_png_size;
-extern char datatoc_twist_png[];
+extern const char datatoc_twist_png[];
extern int datatoc_vertexdraw_png_size;
-extern char datatoc_vertexdraw_png[];
+extern const char datatoc_vertexdraw_png[];
/* Matcap files */
extern int datatoc_mc01_jpg_size;
-extern char datatoc_mc01_jpg[];
+extern const char datatoc_mc01_jpg[];
extern int datatoc_mc02_jpg_size;
-extern char datatoc_mc02_jpg[];
+extern const char datatoc_mc02_jpg[];
extern int datatoc_mc03_jpg_size;
-extern char datatoc_mc03_jpg[];
+extern const char datatoc_mc03_jpg[];
extern int datatoc_mc04_jpg_size;
-extern char datatoc_mc04_jpg[];
+extern const char datatoc_mc04_jpg[];
extern int datatoc_mc05_jpg_size;
-extern char datatoc_mc05_jpg[];
+extern const char datatoc_mc05_jpg[];
extern int datatoc_mc06_jpg_size;
-extern char datatoc_mc06_jpg[];
+extern const char datatoc_mc06_jpg[];
extern int datatoc_mc07_jpg_size;
-extern char datatoc_mc07_jpg[];
+extern const char datatoc_mc07_jpg[];
extern int datatoc_mc08_jpg_size;
-extern char datatoc_mc08_jpg[];
+extern const char datatoc_mc08_jpg[];
extern int datatoc_mc09_jpg_size;
-extern char datatoc_mc09_jpg[];
+extern const char datatoc_mc09_jpg[];
extern int datatoc_mc10_jpg_size;
-extern char datatoc_mc10_jpg[];
+extern const char datatoc_mc10_jpg[];
extern int datatoc_mc11_jpg_size;
-extern char datatoc_mc11_jpg[];
+extern const char datatoc_mc11_jpg[];
extern int datatoc_mc12_jpg_size;
-extern char datatoc_mc12_jpg[];
+extern const char datatoc_mc12_jpg[];
extern int datatoc_mc13_jpg_size;
-extern char datatoc_mc13_jpg[];
+extern const char datatoc_mc13_jpg[];
extern int datatoc_mc14_jpg_size;
-extern char datatoc_mc14_jpg[];
+extern const char datatoc_mc14_jpg[];
extern int datatoc_mc15_jpg_size;
-extern char datatoc_mc15_jpg[];
+extern const char datatoc_mc15_jpg[];
extern int datatoc_mc16_jpg_size;
-extern char datatoc_mc16_jpg[];
+extern const char datatoc_mc16_jpg[];
extern int datatoc_mc17_jpg_size;
-extern char datatoc_mc17_jpg[];
+extern const char datatoc_mc17_jpg[];
extern int datatoc_mc18_jpg_size;
-extern char datatoc_mc18_jpg[];
+extern const char datatoc_mc18_jpg[];
extern int datatoc_mc19_jpg_size;
-extern char datatoc_mc19_jpg[];
+extern const char datatoc_mc19_jpg[];
extern int datatoc_mc20_jpg_size;
-extern char datatoc_mc20_jpg[];
+extern const char datatoc_mc20_jpg[];
extern int datatoc_mc21_jpg_size;
-extern char datatoc_mc21_jpg[];
+extern const char datatoc_mc21_jpg[];
extern int datatoc_mc22_jpg_size;
-extern char datatoc_mc22_jpg[];
+extern const char datatoc_mc22_jpg[];
extern int datatoc_mc23_jpg_size;
-extern char datatoc_mc23_jpg[];
+extern const char datatoc_mc23_jpg[];
extern int datatoc_mc24_jpg_size;
-extern char datatoc_mc24_jpg[];
+extern const char datatoc_mc24_jpg[];
/* grease pencil sculpt brushes files */
extern int datatoc_gp_brush_smooth_png_size;
-extern char datatoc_gp_brush_smooth_png[];
+extern const char datatoc_gp_brush_smooth_png[];
extern int datatoc_gp_brush_thickness_png_size;
-extern char datatoc_gp_brush_thickness_png[];
+extern const char datatoc_gp_brush_thickness_png[];
extern int datatoc_gp_brush_stre
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list