diff options
| author | Evan Huus <eapache@gmail.com> | 2013-12-20 14:45:24 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-12-20 14:45:24 +0000 |
| commit | c38424311f573b631b4015ff587c8423ceaef57f (patch) | |
| tree | 1aae46fdde46660283b5fae4a6d49f90fa8b33f5 | |
| parent | 9fba5a787ebce032b31105aad1d575258db0c568 (diff) | |
Replace one more g_memmove with memmove, add a cast to make the Lua stuff
compile.
svn path=/trunk/; revision=54296
| -rw-r--r-- | epan/wslua/wslua_proto.c | 2 | ||||
| -rw-r--r-- | ui/export_object_smb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c index 3fd89d4438..5931ec3aae 100644 --- a/epan/wslua/wslua_proto.c +++ b/epan/wslua/wslua_proto.c @@ -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)); } diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c index dec3de9eca..59ccaa2cb2 100644 --- a/ui/export_object_smb.c +++ b/ui/export_object_smb.c @@ -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); } } |