Follow-up Comment #11, patch #1339 (project freeciv):

Updated patch trunk rev.21114

The patch is different. I don't delete nothing, but I only add new functions:
server/ruleset.c, common/unittype.c, common/unittype.h, common/packets.def and
client/packhand.c.

gmake result:


city.c: In function 'city_choose_build_default':
city.c:1020:2: warning: comparison between pointer and integer [enabled by
default]

improvement.c: In function 'impr_provides_buildable_units':
improvement.c:334:3: warning: comparison between pointer and integer [enabled
by default]

unittype.c: In function 'unit_type_by_translated_name':
unittype.c:512:3: warning: comparison between pointer and integer [enabled by
default]
unittype.c: In function 'unit_type_by_rule_name':
unittype.c:529:3: warning: comparison between pointer and integer [enabled by
default]
unittype.c: In function 'can_unit_happen':
unittype.c:749:26: warning: passing argument 8 of 'are_reqs_active' from
incompatible pointer type [enabled by default]
requirements.h:95:6: note: expected 'const struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
unittype.c:752:25: warning: passing argument 8 of 'are_reqs_active' from
incompatible pointer type [enabled by default]
requirements.h:95:6: note: expected 'const struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
unittype.c: In function 'precalc_one':
unittype.c:813:3: warning: comparison between pointer and integer [enabled by
default]
unittype.c:822:5: warning: comparison between pointer and integer [enabled by
default]
unittype.c: In function 'unit_types_init':
unittype.c:982:5: warning: passing argument 1 of 'requirement_vector_init'
from incompatible pointer type [enabled by default]
../utility/specvec.h:72:1: note: expected 'struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
unittype.c:983:5: warning: passing argument 1 of 'requirement_vector_init'
from incompatible pointer type [enabled by default]
../utility/specvec.h:72:1: note: expected 'struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
unittype.c: In function 'unit_types_free':
unittype.c:1004:3: warning: comparison between pointer and integer [enabled by
default]
unittype.c:1006:5: warning: passing argument 1 of 'requirement_vector_free'
from incompatible pointer type [enabled by default]
../utility/specvec.h:117:1: note: expected 'struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
unittype.c:1007:5: warning: passing argument 1 of 'requirement_vector_free'
from incompatible pointer type [enabled by default]
../utility/specvec.h:117:1: note: expected 'struct requirement_vector *' but
argument is of type 'struct requirement_vector **'

aiair.c: In function 'dai_choose_attacker_air':
aiair.c:444:3: warning: comparison between pointer and integer [enabled by
default]

aihunt.c: In function 'dai_hunter_guess_best':
aihunt.c:85:3: warning: comparison between pointer and integer [enabled by
default]
aihunt.c: In function 'dai_hunter_missile_want':
aihunt.c:165:3: warning: comparison between pointer and integer [enabled by
default]

aiparatrooper.c: In function 'dai_choose_paratrooper':
aiparatrooper.c:340:3: warning: comparison between pointer and integer
[enabled by default]

aiunit.c: In function 'update_simple_ai_types':
aiunit.c:2574:3: warning: comparison between pointer and integer [enabled by
default]

ruleset.c: In function 'load_unit_names':
ruleset.c:1098:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c: In function 'load_ruleset_units':
ruleset.c:1373:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:1406:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:1414:5: warning: passing argument 1 of 'requirement_vector_copy'
from incompatible pointer type [enabled by default]
../utility/specvec.h:110:1: note: expected 'struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
ruleset.c:1417:5: warning: passing argument 1 of 'requirement_vector_copy'
from incompatible pointer type [enabled by default]
../utility/specvec.h:110:1: note: expected 'struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
ruleset.c:1559:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:1590:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:1620:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c: In function 'load_ruleset_buildings':
ruleset.c:1819:5: warning: comparison between pointer and integer [enabled by
default]
ruleset.c: In function 'send_ruleset_units':
ruleset.c:3890:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:3908:5: error: request for member 'size' in something not a
structure or union
ruleset.c:3908:5: error: request for member 'p' in something not a structure
or union
ruleset.c:3913:5: error: request for member 'size' in something not a
structure or union
ruleset.c:3913:5: error: request for member 'p' in something not a structure
or union
ruleset.c: In function 'sanity_check_ruleset_data':
ruleset.c:4992:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:5036:3: warning: comparison between pointer and integer [enabled by
default]
ruleset.c:5038:36: warning: passing argument 1 of 'sanity_check_req_nreq_vec'
from incompatible pointer type [enabled by default]
ruleset.c:4881:13: note: expected 'const struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
ruleset.c:5038:36: warning: passing argument 2 of 'sanity_check_req_nreq_vec'
from incompatible pointer type [enabled by default]
ruleset.c:4881:13: note: expected 'const struct requirement_vector *' but
argument is of type 'struct requirement_vector **'
gmake[3]: *** [ruleset.lo] Errore 1
gmake[3]: Leaving directory `/home/giorgio/freeciv/server'
gmake[2]: *** [all-recursive] Errore 1
gmake[2]: Leaving directory `/home/giorgio/freeciv/server'
gmake[1]: *** [all-recursive] Errore 1
gmake[1]: Leaving directory `/home/giorgio/freeciv'
gmake: *** [all] Errore 2


(file #15505)
    _______________________________________________________

Additional Item Attachment:

File name: trunk-rev21114_requirement_vector.diff Size:6 KB


    _______________________________________________________

Reply to this item at:

  <http://gna.org/patch/?1339>

_______________________________________________
  Message sent via/by Gna!
  http://gna.org/


_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to