From 57a82a26e7483763b978f1e623eecfbcdb4e8da9 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 17 Sep 2022 09:19:00 -0700 Subject: [PATCH] pkg/fontconfig: const pointers --- pkg/fontconfig/char_set.zig | 11 +++++++++-- pkg/fontconfig/lang_set.zig | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pkg/fontconfig/char_set.zig b/pkg/fontconfig/char_set.zig index 3101f7258..4b3e3da01 100644 --- a/pkg/fontconfig/char_set.zig +++ b/pkg/fontconfig/char_set.zig @@ -11,8 +11,8 @@ pub const CharSet = opaque { c.FcCharSetDestroy(self.cval()); } - pub fn hasChar(self: *CharSet, cp: u32) bool { - return c.FcCharSetHasChar(self.cval(), cp) == c.FcTrue; + pub fn hasChar(self: *const CharSet, cp: u32) bool { + return c.FcCharSetHasChar(self.cvalConst(), cp) == c.FcTrue; } pub inline fn cval(self: *CharSet) *c.struct__FcCharSet { @@ -21,6 +21,13 @@ pub const CharSet = opaque { self, ); } + + pub inline fn cvalConst(self: *const CharSet) *const c.struct__FcCharSet { + return @ptrCast( + *const c.struct__FcCharSet, + self, + ); + } }; test "create" { diff --git a/pkg/fontconfig/lang_set.zig b/pkg/fontconfig/lang_set.zig index 7f71f394a..779ff1719 100644 --- a/pkg/fontconfig/lang_set.zig +++ b/pkg/fontconfig/lang_set.zig @@ -11,8 +11,8 @@ pub const LangSet = opaque { c.FcLangSetDestroy(self.cval()); } - pub fn hasLang(self: *LangSet, lang: [:0]const u8) bool { - return c.FcLangSetHasLang(self.cval(), lang.ptr) == c.FcTrue; + pub fn hasLang(self: *const LangSet, lang: [:0]const u8) bool { + return c.FcLangSetHasLang(self.cvalConst(), lang.ptr) == c.FcTrue; } pub inline fn cval(self: *LangSet) *c.struct__FcLangSet { @@ -21,6 +21,13 @@ pub const LangSet = opaque { self, ); } + + pub inline fn cvalConst(self: *const LangSet) *const c.struct__FcLangSet { + return @ptrCast( + *const c.struct__FcLangSet, + self, + ); + } }; test "create" {