Skip to content

Commit 9cb8df2

Browse files
committed
Replace pointer type to static
1 parent e4f4585 commit 9cb8df2

7 files changed

Lines changed: 12 additions & 11 deletions

File tree

bindings/luabinding.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@ int msclualogparser_parse (lua_State *L) {
265265
subtable = lua_gettop(L);
266266

267267
lua_pushinteger(L, 1);
268-
lua_pushinteger(L, *logerr.startpos);
268+
lua_pushinteger(L, logerr.startpos);
269269
lua_settable(L, subtable);
270270

271271
lua_pushinteger(L, 2);
272-
lua_pushinteger(L, *logerr.endpos);
272+
lua_pushinteger(L, logerr.endpos);
273273
lua_settable(L, subtable);
274274

275275
lua_settable(L, errorspostable);

bindings/phpbinding.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ PHP_FUNCTION(parse)
160160
add_next_index_string(&errors, logerr.errmsg);
161161
zval pairs;
162162
array_init(&pairs);
163-
add_next_index_long(&pairs, *logerr.startpos);
164-
add_next_index_long(&pairs, *logerr.endpos);
163+
add_next_index_long(&pairs, logerr.startpos);
164+
add_next_index_long(&pairs, logerr.endpos);
165165
add_next_index_zval(&errorspos, &pairs);
166166
}
167167
}

bindings/pybinding.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static PyObject* mscpylogparser_parse(PyObject *self, PyObject *args) {
8989
for (int c=0; c < l.log_entry_errors_cnt; c++) {
9090
read_msclog_err(&l.lineerrpool, &logerr);
9191
PyList_Append(errors, Py_BuildValue("s", logerr.errmsg));
92-
PyList_Append(errorspos, Py_BuildValue("[k,k]", *logerr.startpos, *logerr.endpos));
92+
PyList_Append(errorspos, Py_BuildValue("[i,i]", logerr.startpos, logerr.endpos));
9393
}
9494
}
9595

bindings/rubybinding.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static VALUE mscrubylogparser_parse(VALUE self, VALUE arg1, VALUE arg2, VALUE ar
114114
for(int c = 0; c < l.log_entry_errors_cnt; c++) {
115115
read_msclog_err(&l.lineerrpool, &logerr);
116116
rb_ary_push(errors, rb_str_new2(logerr.errmsg));
117-
rb_ary_push(errorspos, rb_ary_new3(2, INT2NUM(*logerr.startpos), INT2NUM(*logerr.endpos)));
117+
rb_ary_push(errorspos, rb_ary_new3(2, INT2NUM(logerr.startpos), INT2NUM(logerr.endpos)));
118118
}
119119
}
120120
rb_hash_aset(result, ID2SYM(rb_intern("log_entry_errors")), errors);

examples/example01.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ int main(int argc, char ** argv) {
6060
l.lineerrpool.currptr = l.lineerrpool.pool;
6161
for (int c=0; c < l.log_entry_errors_cnt; c++) {
6262
msclogerr err;
63+
memset(&err, 0, sizeof(err));
6364
read_msclog_err(&l.lineerrpool, &err);
64-
printf("%s - %zu:%zu\n", err.errmsg, *err.startpos, *err.endpos);
65+
printf("%s - %zu:%zu\n", err.errmsg, err.startpos, err.endpos);
6566
}
6667
}
6768
printf("%s", line);

src/msclogparser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ void read_msclog_err(msclogpool *pool, msclogerr *err) {
7272
err->errmsg = pool->currptr;
7373
pool->currptr += strlen(err->errmsg) + 1;
7474

75-
err->startpos = (size_t *)pool->currptr;
75+
memcpy(&err->startpos, pool->currptr, sizeof(size_t));
7676
pool->currptr += sizeof(size_t);
7777

78-
err->endpos = (size_t *)pool->currptr;
78+
memcpy(&err->endpos, pool->currptr, sizeof(size_t));
7979
pool->currptr += sizeof(size_t);
8080

8181
return;

src/msclogparser.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ typedef struct msclogpool {
7979

8080
typedef struct msclogerr {
8181
char *errmsg;
82-
size_t *startpos;
83-
size_t *endpos;
82+
size_t startpos;
83+
size_t endpos;
8484
} msclogerr;
8585

8686
typedef struct logdata {

0 commit comments

Comments
 (0)