summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMasaki Muranaka <[email protected]>2013-03-01 14:22:42 +0900
committerMasaki Muranaka <[email protected]>2013-03-01 14:28:22 +0900
commite4231a0a33f8b2961dbae50a53c5fc89fefe83a1 (patch)
treee1dc91bf7d7ff64f080e8707df8b0289ef15214f /src
parent028ac46df7c6569f361a685a000ebc425be16c22 (diff)
downloadmruby-e4231a0a33f8b2961dbae50a53c5fc89fefe83a1.tar.gz
mruby-e4231a0a33f8b2961dbae50a53c5fc89fefe83a1.zip
Add typedef to structures that have mrb_ prefix. Use typedef-ed type instead of struct directly.
Diffstat (limited to 'src')
-rw-r--r--src/array.c6
-rw-r--r--src/etc.c8
-rw-r--r--src/range.c4
-rw-r--r--src/string.c10
4 files changed, 14 insertions, 14 deletions
diff --git a/src/array.c b/src/array.c
index 88c15eb2c..c767283aa 100644
--- a/src/array.c
+++ b/src/array.c
@@ -125,7 +125,7 @@ static void
ary_modify(mrb_state *mrb, struct RArray *a)
{
if (a->flags & MRB_ARY_SHARED) {
- struct mrb_shared_array *shared = a->aux.shared;
+ mrb_shared_array *shared = a->aux.shared;
if (shared->refcnt == 1 && a->ptr == shared->ptr) {
a->ptr = shared->ptr;
@@ -154,7 +154,7 @@ static void
ary_make_shared(mrb_state *mrb, struct RArray *a)
{
if (!(a->flags & MRB_ARY_SHARED)) {
- struct mrb_shared_array *shared = (struct mrb_shared_array *)mrb_malloc(mrb, sizeof(struct mrb_shared_array));
+ mrb_shared_array *shared = (mrb_shared_array *)mrb_malloc(mrb, sizeof(mrb_shared_array));
shared->refcnt = 1;
if (a->aux.capa > a->len) {
@@ -667,7 +667,7 @@ mrb_ary_len(mrb_state *mrb, mrb_value ary)
}
void
-mrb_ary_decref(mrb_state *mrb, struct mrb_shared_array *shared)
+mrb_ary_decref(mrb_state *mrb, mrb_shared_array *shared)
{
shared->refcnt--;
if (shared->refcnt == 0) {
diff --git a/src/etc.c b/src/etc.c
index 6a43ddd31..626627f6f 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -11,19 +11,19 @@
#include "mruby/data.h"
struct RData*
-mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const struct mrb_data_type *type)
+mrb_data_object_alloc(mrb_state *mrb, struct RClass *klass, void *ptr, const mrb_data_type *type)
{
struct RData *data;
data = (struct RData*)mrb_obj_alloc(mrb, MRB_TT_DATA, klass);
data->data = ptr;
- data->type = (struct mrb_data_type*) type;
+ data->type = (mrb_data_type*) type;
return data;
}
void *
-mrb_get_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type)
+mrb_get_datatype(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
{
if (mrb_special_const_p(obj) || (mrb_type(obj) != MRB_TT_DATA)) {
return NULL;
@@ -35,7 +35,7 @@ mrb_get_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type
}
void *
-mrb_check_datatype(mrb_state *mrb, mrb_value obj, const struct mrb_data_type *type)
+mrb_check_datatype(mrb_state *mrb, mrb_value obj, const mrb_data_type *type)
{
static const char mesg[] = "wrong argument type %s (expected %s)";
diff --git a/src/range.c b/src/range.c
index 2e9ec26ed..aac1d830a 100644
--- a/src/range.c
+++ b/src/range.c
@@ -40,7 +40,7 @@ mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, int excl)
r = (struct RRange*)mrb_obj_alloc(mrb, MRB_TT_RANGE, RANGE_CLASS);
range_check(mrb, beg, end);
- r->edges = (struct mrb_range_edges *)mrb_malloc(mrb, sizeof(struct mrb_range_edges));
+ r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges));
r->edges->beg = beg;
r->edges->end = end;
r->excl = excl;
@@ -103,7 +103,7 @@ range_init(mrb_state *mrb, mrb_value range, mrb_value beg, mrb_value end, int ex
range_check(mrb, beg, end);
r->excl = exclude_end;
if (!r->edges) {
- r->edges = (struct mrb_range_edges *)mrb_malloc(mrb, sizeof(struct mrb_range_edges));
+ r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges));
}
r->edges->beg = beg;
r->edges->end = end;
diff --git a/src/string.c b/src/string.c
index 7af0d1d59..28cf0ab9a 100644
--- a/src/string.c
+++ b/src/string.c
@@ -35,7 +35,7 @@ _obj_classname(mrb_state *mrb, mrb_value obj)
}
void
-mrb_str_decref(mrb_state *mrb, struct mrb_shared_string *shared)
+mrb_str_decref(mrb_state *mrb, mrb_shared_string *shared)
{
shared->refcnt--;
if (shared->refcnt == 0) {
@@ -48,7 +48,7 @@ static void
str_modify(mrb_state *mrb, struct RString *s)
{
if (s->flags & MRB_STR_SHARED) {
- struct mrb_shared_string *shared = s->aux.shared;
+ mrb_shared_string *shared = s->aux.shared;
if (shared->refcnt == 1 && s->ptr == shared->ptr) {
s->ptr = shared->ptr;
@@ -275,7 +275,7 @@ static void
str_make_shared(mrb_state *mrb, struct RString *s)
{
if (!(s->flags & MRB_STR_SHARED)) {
- struct mrb_shared_string *shared = (struct mrb_shared_string *)mrb_malloc(mrb, sizeof(struct mrb_shared_string));
+ mrb_shared_string *shared = (mrb_shared_string *)mrb_malloc(mrb, sizeof(mrb_shared_string));
shared->refcnt = 1;
if (s->aux.capa > s->len) {
@@ -301,7 +301,7 @@ mrb_value
mrb_str_literal(mrb_state *mrb, mrb_value str)
{
struct RString *s, *orig;
- struct mrb_shared_string *shared;
+ mrb_shared_string *shared;
s = str_alloc(mrb, mrb->string_class);
orig = mrb_str_ptr(str);
@@ -1161,7 +1161,7 @@ static mrb_value
mrb_str_subseq(mrb_state *mrb, mrb_value str, int beg, int len)
{
struct RString *orig, *s;
- struct mrb_shared_string *shared;
+ mrb_shared_string *shared;
orig = mrb_str_ptr(str);
str_make_shared(mrb, orig);