Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-09 19:08:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent compiler warnings and potential OLC setting string truncation.

Browse source 
- Prevented compiler warnings when using
’-Wtautological-pointer-compare’ on development system (Darwin)
- Prevented possible string truncation when adding a newline to an OLC
setting string.
This commit is contained in:
WyldTBA 2015-04-23 08:49:48 -04:00
parent 5dc6eae4c5
commit 68fcdb73bf
9 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dg_objcmd.c
View file

@ -510,7 +510,7 @@ static OCMD(do_dgoload)
two_arguments(target, arg1, arg2); /* recycling ... */
tch = get_char_near_obj(obj, arg1);
if (tch) {
if (arg2 != NULL && *arg2 && (pos = find_eq_pos_script(arg2)) >= 0 &&
if (*arg2 && (pos = find_eq_pos_script(arg2)) >= 0 &&
!GET_EQ(tch, pos) && can_wear_on_pos(object, pos)) {
equip_char(tch, object, pos);
load_otrigger(object);
@ -687,7 +687,7 @@ static OCMD(do_osetval)
struct char_data *worn_by = NULL;
two_arguments(argument, arg1, arg2);
if (arg1 == NULL || !*arg1 || arg2 == NULL || !*arg2 || !is_number(arg1) || !is_number(arg2)) {
if (!*arg1 || !*arg2 || !is_number(arg1) || !is_number(arg2)) {
obj_log(obj, "osetval: bad syntax");
return;
}