Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19147
Modified Files:
buildus_county.c
Log Message:
remove unneeded static declaration of locals, and revert tabs to spaces
Index: buildus_county.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildus_county.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildus_county.c 17 Aug 2008 08:43:41 -0000 1.7
--- buildus_county.c 2 Sep 2008 16:11:20 -0000 1.8
***************
*** 79,85 ****
*/
typedef struct {
! RoadMapString name; /**< */
! RoadMapString symbol; /**< */
! RoadMapArea edges; /**< */
} BuildUsState;
--- 79,85 ----
*/
typedef struct {
! RoadMapString name; /**< */
! RoadMapString symbol; /**< */
! RoadMapArea edges; /**< */
} BuildUsState;
***************
*** 145,154 ****
if (this_county->name != name) {
! static BuildMapDictionary county_dictionary;
! county_dictionary = buildmap_dictionary_open ("county");
buildmap_fatal (0, "non unique county FIPS code %d (%s, %s)",
! fips,
! buildmap_dictionary_get(county_dictionary, name),
! buildmap_dictionary_get(county_dictionary, this_county->name));
}
return index;
--- 145,154 ----
if (this_county->name != name) {
! BuildMapDictionary county_dictionary;
! county_dictionary = buildmap_dictionary_open ("county");
buildmap_fatal (0, "non unique county FIPS code %d (%s, %s)",
! fips,
! buildmap_dictionary_get(county_dictionary, name),
! buildmap_dictionary_get(county_dictionary, this_county->name));
}
return index;
***************
*** 203,215 ****
} else if (State[StateCode[fips]].symbol != state_symbol) {
! static BuildMapDictionary BuildMapStateDictionary;
BuildMapStateDictionary = buildmap_dictionary_open ("state");
buildmap_fatal (0, "invalid state FIPS (fips %d, state %s), not %s",
! fips,
! buildmap_dictionary_get(BuildMapStateDictionary,
! state_symbol),
! buildmap_dictionary_get(BuildMapStateDictionary,
! State[StateCode[fips]].symbol));
}
--- 203,214 ----
} else if (State[StateCode[fips]].symbol != state_symbol) {
! BuildMapDictionary BuildMapStateDictionary;
BuildMapStateDictionary = buildmap_dictionary_open ("state");
buildmap_fatal (0, "invalid state FIPS (fips %d, state %s), not %s",
! fips,
! buildmap_dictionary_get(BuildMapStateDictionary, state_symbol),
! buildmap_dictionary_get(BuildMapStateDictionary,
! State[StateCode[fips]].symbol));
}
***************
*** 236,246 ****
if (State[i].name != name) {
! static BuildMapDictionary state_dictionary;
! state_dictionary = buildmap_dictionary_open ("state");
buildmap_fatal (0, "state symbol conflict (%s %s %s)",
! buildmap_dictionary_get(state_dictionary, symbol),
! buildmap_dictionary_get(state_dictionary, State[i].name),
! buildmap_dictionary_get(state_dictionary, name));
}
return;
--- 235,245 ----
if (State[i].name != name) {
! BuildMapDictionary state_dictionary;
! state_dictionary = buildmap_dictionary_open ("state");
buildmap_fatal (0, "state symbol conflict (%s %s %s)",
! buildmap_dictionary_get(state_dictionary, symbol),
! buildmap_dictionary_get(state_dictionary, State[i].name),
! buildmap_dictionary_get(state_dictionary, name));
}
return;
***************
*** 250,254 ****
if (StateCount == MAX_US_STATE - 1) {
! buildmap_fatal(0, "Cannot add more than %d states", MAX_US_STATE);
}
--- 249,253 ----
if (StateCount == MAX_US_STATE - 1) {
! buildmap_fatal(0, "Cannot add more than %d states", MAX_US_STATE);
}
|
