Skip to content

Commit 7536353

Browse files
ktarbetktarbet
authored
fixing several compiler warnings (#339)
* remove heclib6.h (and some un-used dependencies) * cleanup zundeleteAll.c
1 parent 902d454 commit 7536353

43 files changed

Lines changed: 12 additions & 1438 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎heclib/heclib_c/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ src/DssInterface/zgetVersion_.c
197197
src/DssInterface/zritsi7_.c
198198
src/DssInterface/zgetinterval_.c
199199
src/DssInterface/ztsRetrieveIrregArgs.c
200-
src/DssInterface/ztsRetrieveRegArgs.c
201200
src/DssInterface/zclose_.c
202201
src/DssInterface/ztextStoreUnit_.c
203202
src/DssInterface/timeStringToSeconds_.c
@@ -228,7 +227,6 @@ src/DssInterface/v6and7/zopen.c
228227
src/DssInterface/v6and7/zwritec.c
229228
src/DssInterface/v6and7/zreadx.c
230229
src/DssInterface/v6and7/zgetInfo.c
231-
src/DssInterface/v6and7/zreada.c
232230
src/DssInterface/v6and7/zwritex.c
233231
src/DssInterface/v6and7/zdelete.c
234232
src/DssInterface/v6and7/zread.c
@@ -238,7 +236,6 @@ src/DssInterface/v6and7/zputInfo.c
238236
src/DssInterface/v6and7/zundelete.c
239237
src/DssInterface/v6and7/zgetRecordSize.c
240238
src/DssInterface/v6and7/zwritea.c
241-
src/DssInterface/zerrorDecode_.c
242239
src/DssInterface/ztextstorearray_.c
243240
src/DssInterface/ztsIrregStoreFull_.c
244241
src/DssInterface/ztextRetrieveString_.c

‎heclib/heclib_c/heclib_c.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<ClCompile Include="src\DssInterface\v6and7\zopenExtended.c" />
4141
<ClCompile Include="src\DssInterface\v6and7\zputInfo.c" />
4242
<ClCompile Include="src\DssInterface\v6and7\zread.c" />
43-
<ClCompile Include="src\DssInterface\v6and7\zreada.c" />
4443
<ClCompile Include="src\DssInterface\v6and7\zreadc.c" />
4544
<ClCompile Include="src\DssInterface\v6and7\zreadx.c" />
4645
<ClCompile Include="src\DssInterface\v6and7\zrecordAddresses.c" />
@@ -53,7 +52,6 @@
5352
<ClCompile Include="src\DssInterface\v6and7\zwritex.c" />
5453
<ClCompile Include="src\DssInterface\zcheckfilever_.c" />
5554
<ClCompile Include="src\DssInterface\zclose_.c" />
56-
<ClCompile Include="src\DssInterface\zerrorDecode_.c" />
5755
<ClCompile Include="src\DssInterface\zgetinterval_.c" />
5856
<ClCompile Include="src\DssInterface\zgetVersion_.c" />
5957
<ClCompile Include="src\DssInterface\zget_.c" />
@@ -73,7 +71,6 @@
7371
<ClCompile Include="src\DssInterface\ztsIrregRetrieveFull_.c" />
7472
<ClCompile Include="src\DssInterface\ztsIrregStoreFull_.c" />
7573
<ClCompile Include="src\DssInterface\ztsRetrieveIrregArgs.c" />
76-
<ClCompile Include="src\DssInterface\ztsRetrieveRegArgs.c" />
7774
<ClCompile Include="src\DssInterface\ztssrch7_.c" />
7875
<ClCompile Include="src\DssInterface\ztsStoreIrregArgs.c" />
7976
<ClCompile Include="src\DssInterface\ztsStoreRegArgs.c" />

‎heclib/heclib_c/heclib_c.vcxproj.filters‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,6 @@
351351
<ClCompile Include="src\DssInterface\v6and7\zread.c">
352352
<Filter>src\DssInterface\v6andv7</Filter>
353353
</ClCompile>
354-
<ClCompile Include="src\DssInterface\v6and7\zreada.c">
355-
<Filter>src\DssInterface\v6andv7</Filter>
356-
</ClCompile>
357354
<ClCompile Include="src\DssInterface\v6and7\zreadc.c">
358355
<Filter>src\DssInterface\v6andv7</Filter>
359356
</ClCompile>
@@ -396,9 +393,6 @@
396393
<ClCompile Include="src\DssInterface\zclose_.c">
397394
<Filter>src\DssInterface</Filter>
398395
</ClCompile>
399-
<ClCompile Include="src\DssInterface\zerrorDecode_.c">
400-
<Filter>src\DssInterface</Filter>
401-
</ClCompile>
402396
<ClCompile Include="src\DssInterface\zget_.c">
403397
<Filter>src\DssInterface</Filter>
404398
</ClCompile>
@@ -456,9 +450,6 @@
456450
<ClCompile Include="src\DssInterface\ztsRetrieveIrregArgs.c">
457451
<Filter>src\DssInterface</Filter>
458452
</ClCompile>
459-
<ClCompile Include="src\DssInterface\ztsRetrieveRegArgs.c">
460-
<Filter>src\DssInterface</Filter>
461-
</ClCompile>
462453
<ClCompile Include="src\DssInterface\ztssrch7_.c">
463454
<Filter>src\DssInterface</Filter>
464455
</ClCompile>

‎heclib/heclib_c/src/Dss6/filesize.c‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,6 @@ int stringCopy(char *destination, size_t sizeOfDestination, const char* source,
6060
#endif
6161
}
6262

63-
void filesizen_(char *filename, int32_t *nbytes, int32_t *status, size_t filename_len) {
64-
65-
char *fname = NULL;
66-
int32_t i;
67-
68-
fname = (char *)malloc(filename_len + 1);
69-
stringCopy(fname, (filename_len + 1), filename, filename_len);
70-
fname[filename_len] = '\0';
71-
for (i = filename_len - 1; i >= 0; --i) {
72-
if (fname[i] != ' ') break;
73-
fname[i] = '\0';
74-
}
75-
int64_t filesize;
76-
filesizen64_(fname, &filesize, status, filename_len);
77-
if (!*status) {
78-
*nbytes = (int)(filesize <= LONG_MAX ? filesize : -1);
79-
}
80-
free(fname);
81-
}
8263

8364
//-----------------//
8465
// handle versions //

‎heclib/heclib_c/src/DssInterface/v6and7/zdelete.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525

2626
int zdelete(long long *ifltab, const char* pathname)
2727
{
28-
int len;
29-
int boolfound;
30-
3128

3229
if (!pathname) {
3330
return zerrorProcessing(ifltab, DSS_FUNCTION_zdelete_ID, zdssErrorCodes.NULL_PATHNAME,

‎heclib/heclib_c/src/DssInterface/v6and7/zread.c‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,8 @@
2020
int zread(long long *ifltab, zStructTransfer* ztransfer)
2121

2222
{
23-
int zero;
24-
int recordFound;
25-
int nihead, nchead, nuhead, ndata, istatus;
26-
int internalHeaderArraySize;
27-
int header2ArraySize;
28-
int userHeaderArraySize;
29-
int valuesSize;
30-
int len;
31-
int *buffer=0; long long bufferControl[4] ={0,0,0,0};
32-
char pathname[MAX_PATHNAME_LENGTH];
23+
int *buffer=0;
24+
long long bufferControl[4] ={0,0,0,0};
3325

3426

3527
if (!ztransfer) {

‎heclib/heclib_c/src/DssInterface/v6and7/zreada.c‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎heclib/heclib_c/src/DssInterface/v6and7/zreadc.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ int zreadc (long long *ifltab, const char* pathname,
3535
{
3636

3737
int status;
38-
int recordFound;
39-
int zero;
40-
char messageString[70];
41-
char path[MAX_PATHNAME_LENGTH];
4238
zStructTransfer* ztransfer;
4339

4440
int *buffer=0; long long bufferControl[4] ={0,0,0,0};

‎heclib/heclib_c/src/DssInterface/v6and7/zreadx.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ void zreadx(long long *ifltab, const char *pathname,
2424
int *readPlan, int *recordFound)
2525

2626
{
27-
int status;
2827
zStructTransfer* ztransfer;
29-
char path[MAX_PATHNAME_LENGTH];
30-
3128

3229

3330
if (zmessageLevel(ifltab, MESS_METHOD_READ_ID, MESS_LEVEL_INTERNAL_DIAG_1)) {
@@ -54,7 +51,7 @@ void zreadx(long long *ifltab, const char *pathname,
5451
ztransfer->values1 = values;
5552
ztransfer->values1Mode = *valuesSize;
5653

57-
status = zread(ifltab, ztransfer);
54+
int status = zread(ifltab, ztransfer);
5855

5956
if (status == STATUS_RECORD_FOUND) {
6057
*recordFound = 1;

‎heclib/heclib_c/src/DssInterface/v6and7/zsqueeze.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,8 @@
4848

4949
int zsqueeze(const char *dssFilename)
5050
{
51-
52-
5351
char tempDssFilename[_MAX_PATH] = {0};
5452
long long ifltab[600] = {0};
55-
int version;
56-
int status;
5753

5854

5955
#ifdef _MSC_VER
@@ -87,7 +83,7 @@ int zsqueeze(const char *dssFilename)
8783
0, 0, zdssErrorSeverity.INVALID_ARGUMENT, "", "");
8884
}
8985

90-
status = zopenInternal(ifltab, tempDssFilename, 0, 0, 0, 0, 0);
86+
int status = zopenInternal(ifltab, tempDssFilename, 0, 0, 0, 0, 0);
9187
if (zisError(status)) {
9288
printf("File is in use and cannot be squeezed, name: %s\n", tempDssFilename);
9389
return status;

0 commit comments

Comments
 (0)