osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Replace one more g_memmove with memmove, add a cast to make the Lua stuff 

compile.

svn path=/trunk/; revision=54296
This commit is contained in:
Evan Huus 2013-12-20 14:45:24 +00:00
parent 9fba5a787e
commit c38424311f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/wslua/wslua_proto.c
View File

@ -688,7 +688,7 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { /* Creates a new field to be us
const gchar *blob = luaL_optstring(L,WSLUA_OPTARG_ProtoField_new_DESCR,NULL);
if (lua_isnumber(L,WSLUA_ARG_ProtoField_new_TYPE)) {
type = luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE);
type = (enum ftenum)luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE);
} else {
type = get_ftenum(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_TYPE));
}

2
ui/export_object_smb.c
View File

@ -254,7 +254,7 @@ gpointer dest_memory_addr;
/* ...then, put the chunk of the file in the right place */
if (!file->is_out_of_memory) {
dest_memory_addr = entry->payload_data + chunk_offset;
g_memmove(dest_memory_addr, eo_info->payload_data, eo_info->payload_len);
memmove(dest_memory_addr, eo_info->payload_data, eo_info->payload_len);
}
}