m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update For_each_file() to pass both full path and file name only to the callback

Browse Source 
All  callbacks need to extract the filename anyway, so it simplify the code
This commit is contained in:
Thomas Bernard
2018-02-13 10:30:10 +01:00
parent a4593da4d4
commit 4a2754321f
5 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/text.c
View File

@@ -91,9 +91,8 @@ int Compare_fonts(T_Font * font_1, T_Font * font_2)
}
// Ajout d'une fonte à la liste.
void Add_font(const char *name)
static void Add_font(const char *name, const char * font_name)
{
char * font_name;
T_Font * font;
int size=strlen(name)+1;
int index;
@@ -162,17 +161,12 @@ void Add_font(const char *name)
#endif
}
font->Name = (char *)malloc(size);
strcpy(font->Name, name);
font->Name = strdup(name);
// Label
strcpy(font->Label, " ");
memset(font->Label, ' ', sizeof(font->Label));
font->Label[19] = '\0';
if (font->Is_truetype)
font->Label[17]=font->Label[18]='T'; // Logo TT
font_name=Find_last_separator(font->Name);
if (font_name==NULL)
font_name=font->Name;
else
font_name++;
for (index=0; index < 17 && font_name[index]!='\0' && font_name[index]!='.'; index++)
font->Label[index]=font_name[index];