ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/init.C
(Generate patch)

Comparing deliantra/server/common/init.C (file contents):
Revision 1.3 by root, Sun Sep 3 00:18:39 2006 UTC vs.
Revision 1.39 by root, Mon Jul 16 09:07:12 2007 UTC

1/* 1/*
2 * static char *rcsid_init_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * "$Id: init.C,v 1.3 2006/09/03 00:18:39 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
25 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/ 22 */
28 23
29#define EXTERN 24#define EXTERN // horrible hack
30#define INIT_C 25
31#include <global.h> 26#include <global.h>
32#include <object.h> 27#include <object.h>
33 28
29extern const char *const attacktype_desc[NROFATTACKS] = {
30# define def(uc, lc, name, plus, change) # name,
31# include "attackinc.h"
32# undef def
33};
34
35extern const char *const resist_plus[NROFATTACKS] = {
36# define def(uc, lc, name, plus, change) # plus,
37# include "attackinc.h"
38# undef def
39};
40
41extern const char *const change_resist_msg[NROFATTACKS] = {
42# define def(uc, lc, name, plus, change) # change,
43# include "attackinc.h"
44# undef def
45};
46
47int resist_table[NROFATTACKS] = {
48# define def(uc, lc, name, plus, change) ATNR_ ## uc,
49# include "attackinc.h"
50# undef def
51};
52
34/* You unforunately need to looking in include/global.h to see what these 53/* You unforunately need to looking in include/global.h to see what these
35 * correspond to. 54 * correspond to.
36 */ 55 */
37struct Settings settings = { 56struct Settings settings = {
38LOGFILE, /* Logfile */ 57 LOGFILE, /* Logfile */
39CSPORT, /* Client/server port */ 58 CSPORT, /* Client/server port */
40 59
41/* Debug level */ 60/* Debug level */
42#ifdef DEBUG 61#ifdef DEBUG
43 llevDebug, 62 llevDebug,
44#else 63#else
45 llevInfo, 64 llevInfo,
46#endif 65#endif
47 66
480, NULL, 0, /* dumpvalues, dumparg, daemonmode */ 67 0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
490, /* argc */ 68 0, /* argc */
50NULL, /* argv */ 69 NULL, /* argv */
51CONFDIR, 70 CONFDIR,
52DATADIR, 71 DATADIR,
53LOCALDIR, 72 LOCALDIR,
54PLAYERDIR, MAPDIR, ARCHETYPES,REGIONS,TREASURES, 73 PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
55UNIQUE_DIR, TEMPLATE_DIR, 74 UNIQUE_DIR, TEMPLATE_DIR,
56TMPDIR, 75 TMPDIR,
76 PK_LUCK_PENALTY,
57STAT_LOSS_ON_DEATH, 77 STAT_LOSS_ON_DEATH,
58PK_LUCK_PENALTY,
59PERMANENT_EXPERIENCE_RATIO, 78 PERMANENT_EXPERIENCE_RATIO,
60DEATH_PENALTY_RATIO, 79 DEATH_PENALTY_RATIO,
61DEATH_PENALTY_LEVEL, 80 DEATH_PENALTY_LEVEL,
62BALANCED_STAT_LOSS, 81 BALANCED_STAT_LOSS,
63NOT_PERMADETH, 82 NOT_PERMADETH,
64SIMPLE_EXP, 83 SIMPLE_EXP,
65RESET_LOCATION_TIME,
66SET_TITLE, 84 SET_TITLE,
67RESURRECTION, 85 RESURRECTION,
68SEARCH_ITEMS, 86 SEARCH_ITEMS,
69SPELL_ENCUMBRANCE, 87 SPELL_ENCUMBRANCE,
70SPELL_FAILURE_EFFECTS, 88 SPELL_FAILURE_EFFECTS,
71CASTING_TIME, 89 SET_FRIENDLY_FIRE,
72REAL_WIZ, 90 0,
73RECYCLE_TMP_MAPS, 91 0,
74EXPLORE_MODE, 92 EXPLORE_MODE,
75SPELLPOINT_LEVEL_DEPEND, 93 SPELLPOINT_LEVEL_DEPEND,
76SET_FRIENDLY_FIRE,
77"", /* Who format specifier */
78"", /* who wiz format specifier */
79MOTD, 94 MOTD,
80"rules", 95 "rules",
81"news", 96 "news",
82"", /* DM_MAIL */ 97 "", /* DM_MAIL */
830, /* This and the next 3 values are metaserver values */
84"",
85"",
860,
87"",
880,0,0,0,0,0,0,0, /* worldmap settings*/ 98 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
89EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 99 0,
900,
911.0, 100 1.0,
101
92/* Armor enchantment stuff */ 102/* Armor enchantment stuff */
93ARMOR_MAX_ENCHANT, 103 ARMOR_MAX_ENCHANT,
94ARMOR_WEIGHT_REDUCTION, 104 ARMOR_WEIGHT_REDUCTION,
95ARMOR_WEIGHT_LINEAR, 105 ARMOR_WEIGHT_LINEAR,
96ARMOR_SPEED_IMPROVEMENT, 106 ARMOR_SPEED_IMPROVEMENT,
97ARMOR_SPEED_LINEAR, 107 ARMOR_SPEED_LINEAR,
981, /* no_player_stealing */
991, /* create_home_portals */
100}; 108};
101 109
102/* perhaps not the best place for this, but needs to be 110/* perhaps not the best place for this, but needs to be
103 * in some file in the common area so that standalone 111 * in some file in the common area so that standalone
104 * programs, like the random map generator, can be built. 112 * programs, like the random map generator, can be built.
105 */ 113 */
106const char* const spellpathnames[NRSPELLPATHS] = { 114const char *const spellpathnames[NRSPELLPATHS] = {
107 "Protection", 115 "Protection",
108 "Fire", 116 "Fire",
109 "Frost", 117 "Frost",
110 "Electricity", 118 "Electricity",
111 "Missiles", 119 "Missiles",
112 "Self", 120 "Self",
113 "Summoning", 121 "Summoning",
114 "Abjuration", 122 "Abjuration",
115 "Restoration", 123 "Restoration",
116 "Detonation", 124 "Detonation",
117 "Mind", 125 "Mind",
118 "Creation", 126 "Creation",
119 "Teleportation", 127 "Teleportation",
120 "Information", 128 "Information",
121 "Transmutation", 129 "Transmutation",
122 "Transferrence", 130 "Transferrence",
123 "Turning", 131 "Turning",
124 "Wounding", 132 "Wounding",
125 "Death", 133 "Death",
126 "Light" 134 "Light"
127}; 135};
128
129
130/* This loads the emergency map information from a
131 * .emergency file in the map directory. Doing this makes
132 * it easier to switch between map distributions (don't need
133 * to recompile. Note that there is no reason I see that
134 * this could not be re-loaded during play, but it seems
135 * like there should be little reason to do that.
136 */
137static void init_emergency_mappath(void)
138{
139 char filename[MAX_BUF], tmpbuf[MAX_BUF];
140 FILE *fp;
141 int online=0;
142
143 /* If this file doesn't exist, not a big deal */
144 sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir);
145 if ((fp = fopen(filename, "r"))!=NULL) {
146 while (fgets(tmpbuf, MAX_BUF-1, fp)) {
147 if (tmpbuf[0] == '#') continue; /* ignore comments */
148
149 if (online == 0) {
150 tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */
151 settings.emergency_mapname = strdup_local(tmpbuf);
152 }
153 else if (online == 1) {
154 settings.emergency_x = atoi(tmpbuf);
155 }
156
157 else if (online == 2) {
158 settings.emergency_y = atoi(tmpbuf);
159 }
160 online++;
161 if (online>2) break;
162 }
163 fclose(fp);
164 if (online<=2)
165 LOG(llevError,"Online read partial data from %s\n", filename);
166 LOG(llevDebug,"Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname,
167 settings.emergency_x, settings.emergency_y);
168 }
169}
170
171 136
172/* 137/*
173 * It is vital that init_library() is called by any functions 138 * It is vital that init_library() is called by any functions
174 * using this library. 139 * using this library.
175 * If you want to lessen the size of the program using the library, 140 * If you want to lessen the size of the program using the library,
176 * you can replace the call to init_library() with init_globals() and 141 * you can replace the call to init_library() with init_globals() and
177 * init_function_pointers(). Good idea to also call init_vars and 142 * init_function_pointers(). Good idea to also call init_vars and
178 * init_hash_table if you are doing any object loading. 143 * init_hash_table if you are doing any object loading.
179 */ 144 */
180 145void
181void init_library(void) { 146init_library (void)
182 init_environ(); 147{
183 init_globals(); 148 init_globals ();
184 init_objects();
185 init_vars();
186 init_block(); 149 init_block ();
187 ReadBmapNames ();
188 ReadSmooth();
189 init_anim(); /* Must be after we read in the bitmaps */
190 init_archetypes(); /* Reads all archetypes from file */
191 init_dynamic (); 150 init_dynamic ();
192 init_attackmess(); 151 init_attackmess ();
193 init_clocks();
194 init_emergency_mappath();
195 init_experience(); 152 init_experience ();
196} 153}
197 154
198
199/* init_environ initializes values from the environmental variables. 155/* init_environ initialises values from the environmental variables.
200 * it needs to be called very early, since command line options should 156 * it needs to be called very early, since command line options should
201 * overwrite these if specified. 157 * overwrite these if specified.
202 */ 158 */
159void
203void init_environ(void) { 160init_environ (void)
161{
204 char *cp; 162 char *cp;
205 163
206 cp=getenv("CROSSFIRE_LIBDIR"); 164 cp = getenv ("CROSSFIRE_LIBDIR");
165 if (cp)
207 if (cp) settings.datadir=cp; 166 settings.datadir = cp;
167
208 cp=getenv("CROSSFIRE_LOCALDIR"); 168 cp = getenv ("CROSSFIRE_LOCALDIR");
169 if (cp)
209 if (cp) settings.localdir=cp; 170 settings.localdir = cp;
171
210 cp=getenv("CROSSFIRE_PLAYERDIR"); 172 cp = getenv ("CROSSFIRE_PLAYERDIR");
173 if (cp)
211 if (cp) settings.playerdir=cp; 174 settings.playerdir = cp;
175
212 cp=getenv("CROSSFIRE_MAPDIR"); 176 cp = getenv ("CROSSFIRE_MAPDIR");
177 if (cp)
213 if (cp) settings.mapdir=cp; 178 settings.mapdir = cp;
179
214 cp=getenv("CROSSFIRE_ARCHETYPES"); 180 cp = getenv ("CROSSFIRE_ARCHETYPES");
181 if (cp)
215 if (cp) settings.archetypes=cp; 182 settings.archetypes = cp;
183
216 cp=getenv("CROSSFIRE_TREASURES"); 184 cp = getenv ("CROSSFIRE_TREASURES");
185 if (cp)
217 if (cp) settings.treasures=cp; 186 settings.treasures = cp;
187
218 cp=getenv("CROSSFIRE_UNIQUEDIR"); 188 cp = getenv ("CROSSFIRE_UNIQUEDIR");
189 if (cp)
219 if (cp) settings.uniquedir=cp; 190 settings.uniquedir = cp;
191
220 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 192 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
193 if (cp)
221 if (cp) settings.templatedir=cp; 194 settings.templatedir = cp;
195
222 cp=getenv("CROSSFIRE_TMPDIR"); 196 cp = getenv ("CROSSFIRE_TMPDIR");
197 if (cp)
223 if (cp) settings.tmpdir=cp; 198 settings.tmpdir = cp;
224} 199}
225
226 200
227/* 201/*
228 * Initialises all global variables. 202 * Initialises all global variables.
229 * Might use environment-variables as default for some of them. 203 * Might use environment-variables as default for some of them.
230 */ 204 */
231 205void
232void init_globals(void) { 206init_globals (void)
207{
233 if (settings.logfilename[0] == 0) { 208 if (settings.logfilename[0] == 0)
209 logfile = stderr;
210 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
211 {
212 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
234 logfile = stderr; 213 logfile = stderr;
235 } 214 }
236 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) { 215 else
237 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n", 216 setvbuf (logfile, NULL, _IOLBF, 0);
238 settings.logfilename); 217}
239 logfile = stderr; 218
219void
220init_dynamic (void)
221{
222 first_map_ext_path = "/start/HallsOfSelection";
223 first_map_path = "/HallOfSelection";
224}
225
226/*
227 * initialises the attack messages.
228 * Called by init_library().
229 */
230
231//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
232
233void
234init_attackmess (void)
235{
236 char buf[MAX_BUF];
237 char filename[MAX_BUF];
238 char *cp, *p;
239 FILE *fp;
240 static int has_been_done = 0;
241 int mess, level, comp;
242 int mode = 0, total = 0;
243
244 if (has_been_done)
245 return;
246 else
247 has_been_done = 1;
248
249 sprintf (filename, "%s/attackmess", settings.datadir);
250 LOG (llevDebug, "Reading attack messages from %s...\n", filename);
251 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
252 {
253 LOG (llevError, "Can't open %s.\n", filename);
254 return;
240 } 255 }
241 else { 256
242 setvbuf(logfile, NULL, _IOLBF, 0); 257 level = 0;
258 while (fgets (buf, MAX_BUF, fp) != NULL)
243 } 259 {
244 exiting = 0; 260 if (*buf == '#')
245 first_player=NULL; 261 continue;
246 first_friendly_object=NULL; 262 if ((cp = strchr (buf, '\n')) != NULL)
247 first_map=NULL; 263 *cp = '\0';
248 first_treasurelist=NULL; 264 cp = buf;
249 first_artifactlist=NULL; 265 while (*cp == ' ') /* Skip blanks */
250 first_archetype=NULL; 266 cp++;
251 *first_map_ext_path=0;
252 warn_archetypes=0;
253 nroftreasures = 0;
254 nrofartifacts = 0;
255 nrofallowedstr=0;
256 ring_arch = NULL;
257 amulet_arch = NULL;
258 staff_arch = NULL;
259 trying_emergency_save = 0;
260 num_animations=0;
261 animations=NULL;
262 animations_allocated=0;
263 init_defaults();
264}
265 267
266/* 268 if (strncmp (cp, "TYPE:", 5) == 0)
267 * Sets up and initialises the linked list of free and used objects. 269 {
268 * Allocates a certain chunk of objects and puts them on the free list. 270 p = strtok (buf, ":");
269 * Called by init_library(); 271 p = strtok (NULL, ":");
270 */ 272 if (mode == 1)
271 273 {
272void init_objects(void) { 274 attack_mess[mess][level].level = -1;
273 int i; 275 attack_mess[mess][level].buf1 = NULL;
274/* Initialize all objects: */ 276 attack_mess[mess][level].buf2 = NULL;
275 objects=NULL; 277 attack_mess[mess][level].buf3 = NULL;
276 active_objects = NULL;
277
278#ifdef MEMORY_DEBUG
279 free_objects=NULL;
280#else
281 free_objects=objarray;
282 objarray[0].prev=NULL,
283 objarray[0].next= &objarray[1],
284 SET_FLAG(&objarray[0], FLAG_REMOVED);
285 SET_FLAG(&objarray[0], FLAG_FREED);
286 for(i=1;i<STARTMAX-1;i++) {
287 objarray[i].next= &objarray[i+1];
288 objarray[i].prev= &objarray[i-1];
289 SET_FLAG(&objarray[i], FLAG_REMOVED);
290 SET_FLAG(&objarray[i], FLAG_FREED);
291 }
292 objarray[STARTMAX-1].next=NULL;
293 objarray[STARTMAX-1].prev= &objarray[STARTMAX-2];
294 SET_FLAG(&objarray[STARTMAX-1], FLAG_REMOVED);
295 SET_FLAG(&objarray[STARTMAX-1], FLAG_FREED);
296#endif
297}
298
299/*
300 * Initialises global variables which can be changed by options.
301 * Called by init_library().
302 */
303
304void init_defaults(void) {
305 editor=0;
306 nroferrors=0;
307}
308
309
310void init_dynamic (void) {
311 archetype *at = first_archetype;
312 while (at) {
313 if (at->clone.type == MAP) {
314 if (at->clone.race) {
315 strcpy (first_map_ext_path, at->clone.race);
316 } 278 }
317 if (EXIT_PATH (&at->clone)) { 279 level = 0;
318 strcpy (first_map_path, EXIT_PATH (&at->clone)); 280 mess = atoi (p);
319 return; 281 mode = 1;
320 } 282 continue;
321 } 283 }
322 at = at->next; 284 if (mode == 1)
323 } 285 {
324 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n");
325 exit (-1);
326}
327
328unsigned long todtick;
329
330/*
331 * Write out the current time to the file so time does not
332 * reset every time the server reboots.
333 */
334
335void write_todclock(void)
336{
337 char filename[MAX_BUF];
338 FILE *fp;
339
340 sprintf(filename, "%s/clockdata", settings.localdir);
341 if ((fp = fopen(filename, "w")) == NULL) {
342 LOG(llevError, "Cannot open %s for writing\n", filename);
343 return;
344 }
345 fprintf(fp, "%lu", todtick);
346 fclose(fp);
347}
348
349/*
350 * Initializes the gametime and TOD counters
351 * Called by init_library().
352 */
353
354void init_clocks(void)
355{
356 char filename[MAX_BUF];
357 FILE *fp;
358 static int has_been_done=0;
359
360 if (has_been_done)
361 return;
362 else
363 has_been_done = 1;
364
365 sprintf(filename, "%s/clockdata", settings.localdir);
366 LOG(llevDebug, "Reading clockdata from %s...", filename);
367 if ((fp = fopen(filename, "r")) == NULL) {
368 LOG(llevError, "Can't open %s.\n", filename);
369 todtick = 0;
370 write_todclock();
371 return;
372 }
373 fscanf(fp, "%lu", &todtick);
374 LOG(llevDebug, "todtick=%lu\n", todtick);
375 fclose(fp);
376}
377
378/*
379 * Initializes the attack messages.
380 * Called by init_library().
381 */
382
383//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
384
385void init_attackmess(void){
386 char buf[MAX_BUF];
387 char filename[MAX_BUF];
388 char *cp, *p;
389 FILE *fp;
390 static int has_been_done=0;
391 int mess, level, comp;
392 int mode=0, total=0;
393
394 if (has_been_done)
395 return;
396 else
397 has_been_done = 1;
398
399 sprintf(filename, "%s/attackmess", settings.datadir);
400 LOG(llevDebug, "Reading attack messages from %s...", filename);
401 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) {
402 LOG(llevError, "Can't open %s.\n", filename);
403 return;
404 }
405
406 level = 0;
407 while (fgets(buf, MAX_BUF, fp)!=NULL) {
408 if (*buf=='#') continue;
409 if((cp=strchr(buf,'\n'))!=NULL)
410 *cp='\0';
411 cp=buf;
412 while(*cp==' ') /* Skip blanks */
413 cp++;
414
415 if (strncmp(cp, "TYPE:", 5)==0) {
416 p = strtok(buf, ":"); 286 p = strtok (buf, "=");
287 attack_mess[mess][level].level = atoi (buf);
417 p = strtok(NULL, ":"); 288 p = strtok (NULL, "=");
418 if (mode == 1) { 289 if (p != NULL)
419 attack_mess[mess][level].level = -1;
420 attack_mess[mess][level].buf1 = NULL; 290 attack_mess[mess][level].buf1 = strdup (p);
291 else
421 attack_mess[mess][level].buf2 = NULL; 292 attack_mess[mess][level].buf1 = strdup ("");
422 attack_mess[mess][level].buf3 = NULL;
423 }
424 level = 0;
425 mess = atoi(p);
426 mode = 1; 293 mode = 2;
427 continue; 294 continue;
428 } 295 }
429 if (mode==1) { 296 else if (mode == 2)
297 {
430 p = strtok(buf, "="); 298 p = strtok (buf, "=");
431 attack_mess[mess][level].level = atoi(buf); 299 attack_mess[mess][level].level = atoi (buf);
432 p = strtok(NULL, "="); 300 p = strtok (NULL, "=");
433 if (p != NULL) 301 if (p != NULL)
434 attack_mess[mess][level].buf1 = strdup_local(p); 302 attack_mess[mess][level].buf2 = strdup (p);
435 else 303 else
436 attack_mess[mess][level].buf1 = strdup_local(""); 304 attack_mess[mess][level].buf2 = strdup ("");
437 mode = 2; 305 mode = 3;
438 continue; 306 continue;
307 }
439 } else if (mode==2) { 308 else if (mode == 3)
309 {
440 p = strtok(buf, "="); 310 p = strtok (buf, "=");
441 attack_mess[mess][level].level = atoi(buf); 311 attack_mess[mess][level].level = atoi (buf);
442 p = strtok(NULL, "="); 312 p = strtok (NULL, "=");
443 if (p != NULL) 313 if (p != NULL)
444 attack_mess[mess][level].buf2 = strdup_local(p); 314 attack_mess[mess][level].buf3 = strdup (p);
445 else 315 else
446 attack_mess[mess][level].buf2 = strdup_local("");
447 mode = 3;
448 continue;
449 } else if (mode==3) {
450 p = strtok(buf, "=");
451 attack_mess[mess][level].level = atoi(buf);
452 p = strtok(NULL, "=");
453 if (p != NULL)
454 attack_mess[mess][level].buf3 = strdup_local(p);
455 else
456 attack_mess[mess][level].buf3 = strdup_local(""); 316 attack_mess[mess][level].buf3 = strdup ("");
457 mode = 1; 317 mode = 1;
458 level++; 318 level++;
459 total++; 319 total++;
460 continue; 320 continue;
461 } 321 }
462 } 322 }
463 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 323 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
464 close_and_delete(fp, comp); 324 close_and_delete (fp, comp);
465} 325}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines