Skip to content

dix: dixfonts: drop unused GetFontPath() #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2025
Merged

dix: dixfonts: drop unused GetFontPath() #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions dix/dixfonts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ static int num_fpes = 0;
static xfont2_fpe_funcs_rec const **fpe_functions;
static int num_fpe_types = 0;

static unsigned char *font_path_string;

static int num_slept_fpes = 0;
static int size_slept_fpes = 0;
static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0;
Expand Down Expand Up @@ -1767,44 +1765,6 @@ SetDefaultFontPath(const char *path)
return err;
}

int
GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result)
{
int access;
unsigned char *c;
int len;
FontPathElementPtr fpe;

access = dixCallServerAccessCallback(client, DixGetAttrAccess);
if (access != Success)
return access;

len = 0;
for (int i = 0; i < num_fpes; i++) {
fpe = font_path_elements[i];
len += fpe->name_length + 1;
}
c = realloc(font_path_string, len);
if (c == NULL) {
free(font_path_string);
font_path_string = NULL;
return BadAlloc;
}

font_path_string = c;
*length = 0;
for (int i = 0; i < num_fpes; i++) {
fpe = font_path_elements[i];
*c = fpe->name_length;
*length += *c++;
memcpy(c, fpe->name, fpe->name_length);
c += fpe->name_length;
}
*count = num_fpes;
*result = font_path_string;
return Success;
}

void
DeleteClientFontStuff(ClientPtr client)
{
Expand Down
5 changes: 0 additions & 5 deletions include/dixfont.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ extern _X_EXPORT int SetFontPath(ClientPtr /*client */ ,

extern _X_EXPORT int SetDefaultFontPath(const char * /*path */ );

/* not used by any known external driver, so can be removed soon */
extern _X_EXPORT int GetFontPath(ClientPtr client,
int *count,
int *length, unsigned char **result) _X_DEPRECATED;

extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client */ );

/* Quartz support on Mac OS X pulls in the QuickDraw
Expand Down