adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some sensible indenting. Now if only we could have some sensible code.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1140 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-08-29 01:32:33 +00:00
parent 15d84e449c
commit 79f591a3ef
1 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/strings/getstr.c
+12 -11
View File
@@ -48,7 +48,8 @@ _GetStringData (uio_Stream *fp, DWORD length)
char *s; char *s;
extern char *_cur_resfile_name; extern char *_cur_resfile_name;
if (_cur_resfile_name && (s = strrchr (_cur_resfile_name, '.')) && stricmp (s, ".txt") == 0) if (_cur_resfile_name && (s = strrchr (_cur_resfile_name, '.')) &&
stricmp (s, ".txt") == 0)
{ {
#define MAX_STRINGS 2048 #define MAX_STRINGS 2048
#define POOL_SIZE 4096 #define POOL_SIZE 4096
@@ -57,7 +58,8 @@ _GetStringData (uio_Stream *fp, DWORD length)
slen[MAX_STRINGS], StringOffs, tot_string_size, slen[MAX_STRINGS], StringOffs, tot_string_size,
clen[MAX_STRINGS], ClipOffs, tot_clip_size, clen[MAX_STRINGS], ClipOffs, tot_clip_size,
tslen[MAX_STRINGS], TSOffs, tot_ts_size; tslen[MAX_STRINGS], TSOffs, tot_ts_size;
char CurrentLine[1024], clip_path[1024], *strdata, *clipdata, *ts_data; char CurrentLine[1024], clip_path[1024], *strdata, *clipdata,
*ts_data;
uio_Stream *timestamp_fp = NULL; uio_Stream *timestamp_fp = NULL;
if ((strdata = HMalloc (tot_string_size = POOL_SIZE)) == 0) if ((strdata = HMalloc (tot_string_size = POOL_SIZE)) == 0)
@@ -164,10 +166,11 @@ _GetStringData (uio_Stream *fp, DWORD length)
} }
} }
} }
if (! ts_ok) if (!ts_ok)
{ {
// timestamp data is invalid, remove all of it // timestamp data is invalid, remove all of it
fprintf (stderr, "Invalid timestamp data for '%s'. Disabling timestamps\n", s); fprintf (stderr, "Invalid timestamp data "
"for '%s'. Disabling timestamps\n", s);
HFree (ts_data); HFree (ts_data);
uio_fclose (timestamp_fp); uio_fclose (timestamp_fp);
timestamp_fp = NULL; timestamp_fp = NULL;
@@ -239,10 +242,7 @@ _GetStringData (uio_Stream *fp, DWORD length)
if (++n && (hData = AllocStringTable ( if (++n && (hData = AllocStringTable (
(sizeof (STRING_TABLE_DESC) - sizeof (DWORD)) (sizeof (STRING_TABLE_DESC) - sizeof (DWORD))
+ (sizeof (DWORD) * ((n + 1) * num_data_sets)) + (sizeof (DWORD) * ((n + 1) * num_data_sets))
+ StringOffs + StringOffs + ClipOffs + TSOffs)))
+ ClipOffs
+ TSOffs
)))
{ {
PDWORD lpStringOffs, lpClipOffs, lpTSOffs; PDWORD lpStringOffs, lpClipOffs, lpTSOffs;
STRING_TABLEPTR lpST; STRING_TABLEPTR lpST;
@@ -255,9 +255,10 @@ _GetStringData (uio_Stream *fp, DWORD length)
if (TSOffs) if (TSOffs)
lpST->flags |= HAS_TIMESTAMP; lpST->flags |= HAS_TIMESTAMP;
memcpy (&lpST->StringOffsets[(n + 1) * num_data_sets], strdata, StringOffs); memcpy (&lpST->StringOffsets[(n + 1) * num_data_sets],
memcpy ((BYTE *)&lpST->StringOffsets[(n + 1) * num_data_sets] + StringOffs, strdata, StringOffs);
clipdata, ClipOffs); memcpy ((BYTE *)&lpST->StringOffsets[(n + 1) * num_data_sets]
+ StringOffs, clipdata, ClipOffs);
memcpy ((BYTE *)&lpST->StringOffsets[(n + 1) * num_data_sets] memcpy ((BYTE *)&lpST->StringOffsets[(n + 1) * num_data_sets]
+ StringOffs + ClipOffs, ts_data, TSOffs); + StringOffs + ClipOffs, ts_data, TSOffs);
TSOffs = ((BYTE *)&lpST->StringOffsets[(n + 1) * num_data_sets] TSOffs = ((BYTE *)&lpST->StringOffsets[(n + 1) * num_data_sets]