[Getdata-commits] SF.net SVN: getdata:[731] trunk/getdata
Scientific Database Format
Brought to you by:
ketiltrout
|
From: <ket...@us...> - 2012-06-29 22:00:55
|
Revision: 731
http://getdata.svn.sourceforge.net/getdata/?rev=731&view=rev
Author: ketiltrout
Date: 2012-06-29 22:00:49 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
C89-ify
Modified Paths:
--------------
trunk/getdata/bindings/f77/fgetdata.h
trunk/getdata/src/name.c
trunk/getdata/test/version_9_strict.c
Modified: trunk/getdata/bindings/f77/fgetdata.h
===================================================================
--- trunk/getdata/bindings/f77/fgetdata.h 2012-06-29 20:58:30 UTC (rev 730)
+++ trunk/getdata/bindings/f77/fgetdata.h 2012-06-29 22:00:49 UTC (rev 731)
@@ -728,6 +728,22 @@
void F77_FUNC(gdentn, GDENTN) (char *name, int32_t *name_l,
const int32_t *dirfile, const char *parent, const int32_t *parent_l,
const int32_t *type, const int32_t *flags, const int32_t *field_num);
+
+void F77_FUNC(gdgewd, GDGEWD) (char *in_field, int32_t *in_field_l,
+ char *check_field, int32_t *check_field_l, int32_t *windop,
+ int32_t *ithreshold, double *rthreshold, int32_t *fragment_index,
+ const int32_t *dirfile, const char *field_code,
+ const int32_t *field_code_l);
+
+void F77_FUNC(gdecnt, GDECNT) (int32_t *error_count, const int32_t *dirfile);
+
+void F77_FUNC(gdtoke, GDTOKE) (char *toke, int32_t *toke_l,
+ const int32_t *dirfile, const char *string, const int32_t *string_l);
+
+void F77_FUNC(gdgemx, GDGEMX) (char *in_field, int32_t *in_field_l,
+ char *count_field, int32_t *count_field_l, int32_t *val, int32_t *max,
+ int32_t *fragment_index, const int32_t *dirfile, const char *field_code,
+ const int32_t *field_code_l);
#ifdef __cplusplus
}
#endif
Modified: trunk/getdata/src/name.c
===================================================================
--- trunk/getdata/src/name.c 2012-06-29 20:58:30 UTC (rev 730)
+++ trunk/getdata/src/name.c 2012-06-29 22:00:49 UTC (rev 731)
@@ -366,10 +366,6 @@
}
}
- /* gotta update those aliases ... */
- for (u = 0; u < D->n_entries; ++u)
- if (D->entry[u] != E && D->entry[u]->field_type == GD_ALIAS_ENTRY)
-
dreturn("%p", list);
return list;
}
Modified: trunk/getdata/test/version_9_strict.c
===================================================================
--- trunk/getdata/test/version_9_strict.c 2012-06-29 20:58:30 UTC (rev 730)
+++ trunk/getdata/test/version_9_strict.c 2012-06-29 22:00:49 UTC (rev 731)
@@ -35,29 +35,29 @@
const char *format2 = "dirfile/format2";
const char *data = "dirfile/ar";
const char *format_data =
- "/VERSION 8\n" // 0
- "/INCLUDE format1\n" // 1
- "w WINDOW INDEX INDEX SET 0x1\n"; // 2
+ "/VERSION 8\n" /* 0 */
+ "/INCLUDE format1\n" /* 1 */
+ "w WINDOW INDEX INDEX SET 0x1\n"; /* 2 */
const char *format1_data =
"\n\n\n"
- "/VERSION 9\n" // 3
- "/INCLUDE format2 A Z\n" // 4
- "/INCLUDE format2 A.Z\n" // 5
- "Xr RAW COMPLEX128 0xA\n" // 6
- "Xy POLYNOM INDEX 8 055 0xAE 2\n" // 7
- "ar WINDOW AdZ INDEX SET 0x1\n" // 8
- "AINDEXZ PHASE INDEX 0\n" // 9
- "/HIDDEN Xy\n"; // 10
+ "/VERSION 9\n" /* 3 */
+ "/INCLUDE format2 A Z\n" /* 4 */
+ "/INCLUDE format2 A.Z\n" /* 5 */
+ "Xr RAW COMPLEX128 0xA\n" /* 6 */
+ "Xy POLYNOM INDEX 8 055 0xAE 2\n" /* 7 */
+ "ar WINDOW AdZ INDEX SET 0x1\n" /* 8 */
+ "AINDEXZ PHASE INDEX 0\n" /* 9 */
+ "/HIDDEN Xy\n"; /* 10 */
const char *format2_data =
"\n\n\n"
"\n\n\n\n\n\n\n\n"
- "c RAW UINT8 1\n" // 11
- "/HIDDEN c\n" // 12
- "/REFERENCE c\n" // 13
- "/VERSION 8\n" // 14
- "d PHASE INDEX 0\n" // 15
- "d/c CONST FLOAT64 1\n" // 16
- "/META d d CONST FLOAT64 1\n"; // 17
+ "c RAW UINT8 1\n" /* 11 */
+ "/HIDDEN c\n" /* 12 */
+ "/REFERENCE c\n" /* 13 */
+ "/VERSION 8\n" /* 14 */
+ "d PHASE INDEX 0\n" /* 15 */
+ "d/c CONST FLOAT64 1\n" /* 16 */
+ "/META d d CONST FLOAT64 1\n"; /* 17 */
uint16_t c[8];
int ll[NLINES];
unsigned char data_data[256];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|