diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 02:12:57 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 02:12:57 +0400 |
commit | 6972e19fd55470700618174bbba5893d53b1deaa (patch) | |
tree | 51f3fcbd3fa978e9053c9a0763f15232e08ff8ed /source/blender | |
parent | 84df85164d4d869d0830ea23467bcd0e1f127d48 (diff) |
code cleanup:
- replace (strcmp(vfont->name, FO_BUILTIN_NAME) == 0) with (BKE_vfont_is_builtin(vfont)).
- reduce some double promotions.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_font.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 37 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 15 | ||||
-rw-r--r-- | source/blender/blenlib/intern/bpath.c | 7 | ||||
-rw-r--r-- | source/blender/editors/curve/editfont.c | 6 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_vfont.c | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 8 |
11 files changed, 58 insertions, 48 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 3dc68edf12b..8d486218d21 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -310,7 +310,7 @@ int CustomData_layertype_is_singleton(int type); /* make sure the name of layer at index is unique */ void CustomData_set_layer_unique_name(struct CustomData *data, int index); -void CustomData_validate_layer_name(const struct CustomData *data, int type, char *name, char *outname); +void CustomData_validate_layer_name(const struct CustomData *data, int type, const char *name, char *outname); /* for file reading compatibility, returns false if the layer was freed, * only after this test passes, layer->data should be assigned */ diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index d1f0f8c8c23..69e8a6f0653 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -71,9 +71,10 @@ typedef struct EditFont { } EditFont; +int BKE_vfont_is_builtin(struct VFont *vfont); void BKE_vfont_builtin_register(void *mem, int size); -void BKE_vfont_free_data(struct VFont *vf); +void BKE_vfont_free_data(struct VFont *vfont); void BKE_vfont_free(struct VFont *sc); void BKE_vfont_free_global_ttf(void); struct VFont *BKE_vfont_builtin_get(void); diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 8dd3b3da705..d92c4ca8632 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2793,7 +2793,7 @@ void CustomData_set_layer_unique_name(CustomData *data, int index) BLI_uniquename_cb(customdata_unique_check, &data_arg, typeInfo->defaultname, '.', nlayer->name, sizeof(nlayer->name)); } -void CustomData_validate_layer_name(const CustomData *data, int type, char *name, char *outname) +void CustomData_validate_layer_name(const CustomData *data, int type, const char *name, char *outname) { int index = -1; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 1ea8291adb1..74a8751b26a 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -64,11 +64,11 @@ static ListBase ttfdata = {NULL, NULL}; /* The vfont code */ -void BKE_vfont_free_data(struct VFont *vf) +void BKE_vfont_free_data(struct VFont *vfont) { - if (vf->data) { - while (vf->data->characters.first) { - VChar *che = vf->data->characters.first; + if (vfont->data) { + while (vfont->data->characters.first) { + VChar *che = vfont->data->characters.first; while (che->nurbsbase.first) { Nurb *nu = che->nurbsbase.first; @@ -76,14 +76,14 @@ void BKE_vfont_free_data(struct VFont *vf) BLI_freelinkN(&che->nurbsbase, nu); } - BLI_freelinkN(&vf->data->characters, che); + BLI_freelinkN(&vfont->data->characters, che); } - MEM_freeN(vf->data); - vf->data = NULL; + MEM_freeN(vfont->data); + vfont->data = NULL; } - BKE_vfont_tmpfont_remove(vf); + BKE_vfont_tmpfont_remove(vfont); } void BKE_vfont_free(struct VFont *vf) @@ -101,6 +101,11 @@ void BKE_vfont_free(struct VFont *vf) static void *builtin_font_data = NULL; static int builtin_font_size = 0; +int BKE_vfont_is_builtin(struct VFont *vfont) +{ + return (strcmp(vfont->name, FO_BUILTIN_NAME) == 0); +} + void BKE_vfont_builtin_register(void *mem, int size) { builtin_font_data = mem; @@ -185,7 +190,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont) if (!vfont->data) { PackedFile *pf; - if (strcmp(vfont->name, FO_BUILTIN_NAME) == 0) { + if (BKE_vfont_is_builtin(vfont)) { pf = get_builtin_packedfile(); } else { @@ -324,11 +329,13 @@ static VFont *which_vfont(Curve *cu, CharInfo *info) VFont *BKE_vfont_builtin_get(void) { - VFont *vf; + VFont *vfont; - for (vf = G.main->vfont.first; vf; vf = vf->id.next) - if (strcmp(vf->name, FO_BUILTIN_NAME) == 0) - return vf; + for (vfont = G.main->vfont.first; vfont; vfont = vfont->id.next) { + if (BKE_vfont_is_builtin(vfont)) { + return vfont; + } + } return BKE_vfont_load(G.main, FO_BUILTIN_NAME); } @@ -663,10 +670,10 @@ makebreak: /* * The character wasn't in the current curve base so load it - * But if the font is FO_BUILTIN_NAME then do not try loading since + * But if the font is built-in then do not try loading since * whole font is in the memory already */ - if (che == NULL && strcmp(vfont->name, FO_BUILTIN_NAME)) { + if (che == NULL && BKE_vfont_is_builtin(vfont) == FALSE) { BLI_vfontchar_from_freetypefont(vfont, ascii); } diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 52acbeb94e5..f115a41d419 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -50,13 +50,14 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" +#include "BKE_font.h" #include "BKE_global.h" -#include "BKE_main.h" -#include "BKE_sound.h" #include "BKE_image.h" +#include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" +#include "BKE_sound.h" +#include "BKE_utildefines.h" #ifdef _WIN32 #define open _open @@ -219,7 +220,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char void packAll(Main *bmain, ReportList *reports) { Image *ima; - VFont *vf; + VFont *vfont; bSound *sound; for (ima = bmain->image.first; ima; ima = ima->id.next) { @@ -233,9 +234,9 @@ void packAll(Main *bmain, ReportList *reports) } } - for (vf = bmain->vfont.first; vf; vf = vf->id.next) - if (vf->packedfile == NULL && vf->id.lib == NULL && strcmp(vf->name, FO_BUILTIN_NAME) != 0) - vf->packedfile = newPackedFile(reports, vf->name, bmain->name); + for (vfont = bmain->vfont.first; vfont; vfont = vfont->id.next) + if (vfont->packedfile == NULL && vfont->id.lib == NULL && BKE_vfont_is_builtin(vfont) == FALSE) + vfont->packedfile = newPackedFile(reports, vfont->name, bmain->name); for (sound = bmain->sound.first; sound; sound = sound->id.next) if (sound->packedfile == NULL && sound->id.lib == NULL) diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index ed2684befb1..6d95b078340 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -73,6 +73,7 @@ #include "BLI_bpath.h" #include "BLI_utildefines.h" +#include "BKE_font.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" @@ -484,9 +485,9 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int break; case ID_VF: { - VFont *vf = (VFont *)id; - if (vf->packedfile == NULL || (flag & BLI_BPATH_TRAVERSE_SKIP_PACKED) == 0) { - if (strcmp(vf->name, FO_BUILTIN_NAME) != 0) { + VFont *vfont = (VFont *)id; + if (vfont->packedfile == NULL || (flag & BLI_BPATH_TRAVERSE_SKIP_PACKED) == 0) { + if (BKE_vfont_is_builtin(vfont) == FALSE) { rewrite_path_fixed(((VFont *)id)->name, visit_cb, absbase, bpath_user_data); } } diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index bb66b1f4347..eb9246db31e 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1665,7 +1665,7 @@ static int font_open_exec(bContext *C, wmOperator *op) static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) { - VFont *font = NULL; + VFont *vfont = NULL; char *path; PointerRNA idptr; @@ -1678,10 +1678,10 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) if (pprop->prop) { idptr = RNA_property_pointer_get((PointerRNA *)pprop, pprop->prop); - font = idptr.id.data; + vfont = idptr.id.data; } - path = (font && strcmp(font->name, FO_BUILTIN_NAME) != 0) ? font->name : U.fontdir; + path = (vfont && !BKE_vfont_is_builtin(vfont)) ? vfont->name : U.fontdir; if (RNA_struct_property_is_set(op->ptr, "filepath")) return font_open_exec(C, op); diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index d8eb1b011bd..f7eff2cb22b 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -479,7 +479,7 @@ static void ui_draw_but_CHARTAB(uiBut *but) int charmax = G.charmax; /* FO_BUILTIN_NAME font in use. There are TTF FO_BUILTIN_NAME and non-TTF FO_BUILTIN_NAME fonts */ - if (!strcmp(G.selfont->name, FO_BUILTIN_NAME)) { + if (BKE_vfont_is_builtin(G.selfont)) { if (G.ui_international == TRUE) { charmax = 0xff; } @@ -508,7 +508,7 @@ static void ui_draw_but_CHARTAB(uiBut *but) cs = G.charstart; /* Set the font, in case it is not FO_BUILTIN_NAME font */ - if (G.selfont && strcmp(G.selfont->name, FO_BUILTIN_NAME)) { + if (G.selfont && BKE_vfont_is_builtin(G.selfont) == FALSE) { /* Is the font file packed, if so then use the packed file */ if (G.selfont->packedfile) { pf = G.selfont->packedfile; @@ -559,7 +559,7 @@ static void ui_draw_but_CHARTAB(uiBut *but) /* Set the font to be either unicode or FO_BUILTIN_NAME */ wstr[0] = cs; - if (strcmp(G.selfont->name, FO_BUILTIN_NAME)) { + if (BKE_vfont_is_builtin(G.selfont) == FALSE) { BLI_strncpy_wchar_as_utf8((char *)ustr, (wchar_t *)wstr, sizeof(ustr)); } else { @@ -572,8 +572,8 @@ static void ui_draw_but_CHARTAB(uiBut *but) } } - if ((G.selfont && strcmp(G.selfont->name, FO_BUILTIN_NAME)) || - (G.selfont && !strcmp(G.selfont->name, FO_BUILTIN_NAME) && G.ui_international == TRUE)) + if ((G.selfont && (BKE_vfont_is_builtin(G.selfont) == FALSE)) || + (G.selfont && (BKE_vfont_is_builtin(G.selfont) == TRUE) && G.ui_international == TRUE)) { float wid; float llx, lly, llz, urx, ury, urz; diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 7f851c939d2..5151170defe 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -109,12 +109,12 @@ static int rna_ID_name_editable(PointerRNA *ptr) ID *id = (ID *)ptr->data; if (GS(id->name) == ID_VF) { - VFont *vf = (VFont *)id; - if (strcmp(vf->name, FO_BUILTIN_NAME) == 0) - return 0; + VFont *vfont = (VFont *)id; + if (BKE_vfont_is_builtin(vfont)) + return FALSE; } - return 1; + return TRUE; } short RNA_type_to_ID_code(StructRNA *type) diff --git a/source/blender/makesrna/intern/rna_vfont.c b/source/blender/makesrna/intern/rna_vfont.c index b65db1c809c..ff9469550d9 100644 --- a/source/blender/makesrna/intern/rna_vfont.c +++ b/source/blender/makesrna/intern/rna_vfont.c @@ -46,11 +46,11 @@ /* matching fnction in rna_ID.c */ static int rna_VectorFont_filepath_editable(PointerRNA *ptr) { - VFont *vf = ptr->id.data; - if (strcmp(vf->name, FO_BUILTIN_NAME) == 0) { - return 0; + VFont *vfont = ptr->id.data; + if (BKE_vfont_is_builtin(vfont)) { + return FALSE; } - return 1; + return TRUE; } static void rna_VectorFont_reload_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index a55efc0b216..dcb6407b668 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1950,15 +1950,15 @@ static void WM_OT_recover_auto_save(wmOperatorType *ot) /* *************** save file as **************** */ -static void untitled(char *name) +static void untitled(char *filepath) { - if (G.save_over == 0 && strlen(name) < FILE_MAX - 16) { - char *c = BLI_last_slash(name); + if (G.save_over == 0 && strlen(filepath) < FILE_MAX - 16) { + char *c = BLI_last_slash(filepath); if (c) strcpy(&c[1], "untitled.blend"); else - strcpy(name, "untitled.blend"); + strcpy(filepath, "untitled.blend"); } } |