Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
977eeb71
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
大约 1 年 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
977eeb71
编写于
8月 19, 2009
作者:
B
Behdad Esfahbod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[HB] s/writeable/writable/g
上级
2f5931e4
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
27 addition
and
27 deletion
+27
-27
src/hb-blob.c
src/hb-blob.c
+19
-19
src/hb-blob.h
src/hb-blob.h
+5
-5
src/hb-open-type-private.hh
src/hb-open-type-private.hh
+3
-3
未找到文件。
src/hb-blob.c
浏览文件 @
977eeb71
...
...
@@ -111,7 +111,7 @@ hb_blob_create (const char *data,
if
(
blob
->
mode
==
HB_MEMORY_MODE_DUPLICATE
)
{
blob
->
mode
=
HB_MEMORY_MODE_READONLY
;
if
(
!
hb_blob_try_writ
e
able
(
blob
))
{
if
(
!
hb_blob_try_writable
(
blob
))
{
hb_blob_destroy
(
blob
);
return
&
_hb_blob_nil
;
}
...
...
@@ -218,7 +218,7 @@ hb_blob_unlock (hb_blob_t *blob)
}
hb_bool_t
hb_blob_is_writ
e
able
(
hb_blob_t
*
blob
)
hb_blob_is_writable
(
hb_blob_t
*
blob
)
{
hb_memory_mode_t
mode
;
...
...
@@ -231,12 +231,12 @@ hb_blob_is_writeable (hb_blob_t *blob)
hb_mutex_unlock
(
blob
->
lock
);
return
mode
==
HB_MEMORY_MODE_WRIT
E
ABLE
;
return
mode
==
HB_MEMORY_MODE_WRITABLE
;
}
static
hb_bool_t
_try_make_writ
e
able_inplace_unix_locked
(
hb_blob_t
*
blob
)
_try_make_writable_inplace_unix_locked
(
hb_blob_t
*
blob
)
{
#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT)
unsigned
int
pagesize
=
-
1
,
mask
,
length
;
...
...
@@ -276,7 +276,7 @@ _try_make_writeable_inplace_unix_locked (hb_blob_t *blob)
}
#if HB_DEBUG
fprintf
(
stderr
,
"%p %s: successfully made [%p..%p] (%d bytes) writ
e
able
\n
"
,
fprintf
(
stderr
,
"%p %s: successfully made [%p..%p] (%d bytes) writable
\n
"
,
blob
,
__FUNCTION__
,
addr
,
addr
+
length
,
length
);
#endif
...
...
@@ -288,7 +288,7 @@ _try_make_writeable_inplace_unix_locked (hb_blob_t *blob)
hb_bool_t
hb_blob_try_writ
e
able_inplace
(
hb_blob_t
*
blob
)
hb_blob_try_writable_inplace
(
hb_blob_t
*
blob
)
{
hb_memory_mode_t
mode
;
...
...
@@ -297,22 +297,22 @@ hb_blob_try_writeable_inplace (hb_blob_t *blob)
hb_mutex_lock
(
blob
->
lock
);
if
(
blob
->
mode
==
HB_MEMORY_MODE_READONLY_MAY_MAKE_WRIT
E
ABLE
)
{
if
(
blob
->
mode
==
HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE
)
{
#if HB_DEBUG
fprintf
(
stderr
,
"%p %s: making writ
e
able
\n
"
,
blob
,
__FUNCTION__
);
fprintf
(
stderr
,
"%p %s: making writable
\n
"
,
blob
,
__FUNCTION__
);
#endif
if
(
_try_make_writ
e
able_inplace_unix_locked
(
blob
))
{
if
(
_try_make_writable_inplace_unix_locked
(
blob
))
{
#if HB_DEBUG
fprintf
(
stderr
,
"%p %s: making writ
e
able -> succeeded
\n
"
,
blob
,
__FUNCTION__
);
fprintf
(
stderr
,
"%p %s: making writable -> succeeded
\n
"
,
blob
,
__FUNCTION__
);
#endif
blob
->
mode
=
HB_MEMORY_MODE_WRIT
E
ABLE
;
blob
->
mode
=
HB_MEMORY_MODE_WRITABLE
;
}
else
{
#if HB_DEBUG
fprintf
(
stderr
,
"%p %s: making writ
e
able -> FAILED
\n
"
,
blob
,
__FUNCTION__
);
fprintf
(
stderr
,
"%p %s: making writable -> FAILED
\n
"
,
blob
,
__FUNCTION__
);
#endif
/* Failed to make writ
e
able inplace, mark that */
/* Failed to make writable inplace, mark that */
blob
->
mode
=
HB_MEMORY_MODE_READONLY
;
}
}
...
...
@@ -321,11 +321,11 @@ hb_blob_try_writeable_inplace (hb_blob_t *blob)
hb_mutex_unlock
(
blob
->
lock
);
return
mode
==
HB_MEMORY_MODE_WRIT
E
ABLE
;
return
mode
==
HB_MEMORY_MODE_WRITABLE
;
}
hb_bool_t
hb_blob_try_writ
e
able
(
hb_blob_t
*
blob
)
hb_blob_try_writable
(
hb_blob_t
*
blob
)
{
hb_memory_mode_t
mode
;
...
...
@@ -356,7 +356,7 @@ hb_blob_try_writeable (hb_blob_t *blob)
#endif
memcpy
(
new_data
,
blob
->
data
,
blob
->
length
);
blob
->
data
=
new_data
;
blob
->
mode
=
HB_MEMORY_MODE_WRIT
E
ABLE
;
blob
->
mode
=
HB_MEMORY_MODE_WRITABLE
;
_hb_blob_destroy_user_data
(
blob
);
}
}
...
...
@@ -366,8 +366,8 @@ done:
hb_mutex_unlock
(
blob
->
lock
);
if
(
blob
->
mode
==
HB_MEMORY_MODE_READONLY_MAY_MAKE_WRIT
E
ABLE
)
return
hb_blob_try_writ
e
able_inplace
(
blob
);
if
(
blob
->
mode
==
HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE
)
return
hb_blob_try_writable_inplace
(
blob
);
return
mode
==
HB_MEMORY_MODE_WRIT
E
ABLE
;
return
mode
==
HB_MEMORY_MODE_WRITABLE
;
}
src/hb-blob.h
浏览文件 @
977eeb71
...
...
@@ -34,9 +34,9 @@ HB_BEGIN_DECLS
typedef
enum
{
HB_MEMORY_MODE_DUPLICATE
,
HB_MEMORY_MODE_READONLY
,
HB_MEMORY_MODE_WRIT
E
ABLE
,
HB_MEMORY_MODE_WRITABLE
,
HB_MEMORY_MODE_READONLY_NEVER_DUPLICATE
,
HB_MEMORY_MODE_READONLY_MAY_MAKE_WRIT
E
ABLE
HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE
}
hb_memory_mode_t
;
typedef
struct
_hb_blob_t
hb_blob_t
;
...
...
@@ -75,13 +75,13 @@ void
hb_blob_unlock
(
hb_blob_t
*
blob
);
hb_bool_t
hb_blob_is_writ
e
able
(
hb_blob_t
*
blob
);
hb_blob_is_writable
(
hb_blob_t
*
blob
);
hb_bool_t
hb_blob_try_writ
e
able_inplace
(
hb_blob_t
*
blob
);
hb_blob_try_writable_inplace
(
hb_blob_t
*
blob
);
hb_bool_t
hb_blob_try_writ
e
able
(
hb_blob_t
*
blob
);
hb_blob_try_writable
(
hb_blob_t
*
blob
);
HB_END_DECLS
...
...
src/hb-open-type-private.hh
浏览文件 @
977eeb71
...
...
@@ -217,7 +217,7 @@ _hb_sanitize_edit (SANITIZE_ARG_DEF,
const
char
*
base
HB_GNUC_UNUSED
,
unsigned
int
len
HB_GNUC_UNUSED
)
{
bool
perm
=
hb_blob_try_writ
e
able_inplace
(
context
->
blob
);
bool
perm
=
hb_blob_try_writable_inplace
(
context
->
blob
);
context
->
edit_count
++
;
#if HB_DEBUG
...
...
@@ -298,8 +298,8 @@ struct Sanitizer
}
else
{
unsigned
int
edit_count
=
context
.
edit_count
;
_hb_sanitize_fini
(
&
context
,
true
);
if
(
edit_count
&&
!
hb_blob_is_writ
eable
(
blob
)
&&
hb_blob_try_write
able
(
blob
))
{
/* ok, we made it writ
e
able by relocating. try again */
if
(
edit_count
&&
!
hb_blob_is_writ
able
(
blob
)
&&
hb_blob_try_writ
able
(
blob
))
{
/* ok, we made it writable by relocating. try again */
#if HB_DEBUG
fprintf
(
stderr
,
"Sanitizer %p retry %s
\n
"
,
blob
,
__PRETTY_FUNCTION__
);
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录