Changeset: 95bfcd647343 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95bfcd647343
Modified Files:
sql/backends/monet5/vaults/fits.mx
Branch: default
Log Message:
fitsio: use tabs, not spaces, uncrustify
diffs (truncated from 654 to 300 lines):
diff --git a/sql/backends/monet5/vaults/fits.mx
b/sql/backends/monet5/vaults/fits.mx
--- a/sql/backends/monet5/vaults/fits.mx
+++ b/sql/backends/monet5/vaults/fits.mx
@@ -94,39 +94,39 @@
FITSinitCatalog(mvc *m)
{
sql_schema *sch;
- sql_table *fits_tp, *fits_fl, *fits_tbl, *fits_col;
+ sql_table *fits_tp, *fits_fl, *fits_tbl, *fits_col;
- sch = mvc_bind_schema(m,"sys");
+ sch = mvc_bind_schema(m, "sys");
fits_fl = mvc_bind_table(m, sch, "fits_files");
- if ( fits_fl == NULL ){
+ if (fits_fl == NULL) {
fits_fl = mvc_create_table(m, sch, "fits_files", tt_table, 0,
SQL_PERSIST, 0, 2);
- mvc_create_column_(m, fits_fl, "id","int",32);
- mvc_create_column_(m, fits_fl, "name","varchar",80);
+ mvc_create_column_(m, fits_fl, "id", "int", 32);
+ mvc_create_column_(m, fits_fl, "name", "varchar", 80);
}
fits_tbl = mvc_bind_table(m, sch, "fits_tables");
- if ( fits_tbl == NULL ){
+ if (fits_tbl == NULL) {
fits_tbl = mvc_create_table(m, sch, "fits_tables", tt_table, 0,
SQL_PERSIST, 0, 8);
- mvc_create_column_(m, fits_tbl, "id","int",32);
- mvc_create_column_(m, fits_tbl, "name","varchar",80);
- mvc_create_column_(m, fits_tbl, "columns","int",32);
- mvc_create_column_(m, fits_tbl, "file_id","int",32);
- mvc_create_column_(m, fits_tbl, "hdu","int",32);
- mvc_create_column_(m, fits_tbl, "date","varchar",80);
- mvc_create_column_(m, fits_tbl, "origin","varchar",80);
- mvc_create_column_(m, fits_tbl, "comment","varchar",80);
+ mvc_create_column_(m, fits_tbl, "id", "int", 32);
+ mvc_create_column_(m, fits_tbl, "name", "varchar", 80);
+ mvc_create_column_(m, fits_tbl, "columns", "int", 32);
+ mvc_create_column_(m, fits_tbl, "file_id", "int", 32);
+ mvc_create_column_(m, fits_tbl, "hdu", "int", 32);
+ mvc_create_column_(m, fits_tbl, "date", "varchar", 80);
+ mvc_create_column_(m, fits_tbl, "origin", "varchar", 80);
+ mvc_create_column_(m, fits_tbl, "comment", "varchar", 80);
}
fits_col = mvc_bind_table(m, sch, "fits_columns");
- if ( fits_col == NULL ){
+ if (fits_col == NULL) {
fits_col = mvc_create_table(m, sch, "fits_columns", tt_table,
0, SQL_PERSIST, 0, 6);
- mvc_create_column_(m, fits_col, "id","int",32);
- mvc_create_column_(m, fits_col, "name","varchar",80);
- mvc_create_column_(m, fits_col, "type","varchar",80);
- mvc_create_column_(m, fits_col, "units","varchar",10);
- mvc_create_column_(m, fits_col, "number","int",32);
- mvc_create_column_(m, fits_col, "table_id","int",32);
+ mvc_create_column_(m, fits_col, "id", "int", 32);
+ mvc_create_column_(m, fits_col, "name", "varchar", 80);
+ mvc_create_column_(m, fits_col, "type", "varchar", 80);
+ mvc_create_column_(m, fits_col, "units", "varchar", 10);
+ mvc_create_column_(m, fits_col, "number", "int", 32);
+ mvc_create_column_(m, fits_col, "table_id", "int", 32);
}
fits_tp = mvc_bind_table(m, sch, "fits_table_properties");
@@ -141,123 +141,122 @@
}
static int
-fits2mtype( int t )
+fits2mtype(int t)
{
- switch(t) {
- case TBIT:
- case TLOGICAL:
- return TYPE_bit;
- case TBYTE:
- case TSBYTE:
- return TYPE_chr;
- case TSTRING:
- return TYPE_str;
- case TUSHORT:
- case TSHORT:
- return TYPE_sht;
- case TUINT:
- case TINT:
- return TYPE_int;
- case TLONG:
- case TULONG:
- case TLONGLONG:
- return TYPE_lng;
- case TFLOAT:
- return TYPE_flt;
- case TDOUBLE:
- return TYPE_dbl;
- /* missing */
- case TCOMPLEX:
- case TDBLCOMPLEX:
- return -1;
- }
- return -1;
+ switch (t) {
+ case TBIT:
+ case TLOGICAL:
+ return TYPE_bit;
+ case TBYTE:
+ case TSBYTE:
+ return TYPE_chr;
+ case TSTRING:
+ return TYPE_str;
+ case TUSHORT:
+ case TSHORT:
+ return TYPE_sht;
+ case TUINT:
+ case TINT:
+ return TYPE_int;
+ case TLONG:
+ case TULONG:
+ case TLONGLONG:
+ return TYPE_lng;
+ case TFLOAT:
+ return TYPE_flt;
+ case TDOUBLE:
+ return TYPE_dbl;
+ /* missing */
+ case TCOMPLEX:
+ case TDBLCOMPLEX:
+ return -1;
+ }
+ return -1;
}
static int
fits2subtype(sql_subtype *tpe, int t, long rep, long wid)
{
- (void) rep;
- switch(t) {
- case TBIT:
- case TLOGICAL:
- sql_find_subtype(tpe, "boolean", 0, 0 );
+ (void)rep;
+ switch (t) {
+ case TBIT:
+ case TLOGICAL:
+ sql_find_subtype(tpe, "boolean", 0, 0);
break;
- case TBYTE:
- case TSBYTE:
- sql_find_subtype(tpe, "char", 1, 0 );
+ case TBYTE:
+ case TSBYTE:
+ sql_find_subtype(tpe, "char", 1, 0);
break;
- case TSTRING:
+ case TSTRING:
sql_find_subtype(tpe, "varchar", (unsigned int)wid, 0);
break;
- case TUSHORT:
- case TSHORT:
+ case TUSHORT:
+ case TSHORT:
sql_find_subtype(tpe, "smallint", 16, 0);
break;
- case TUINT:
- case TINT:
+ case TUINT:
+ case TINT:
sql_find_subtype(tpe, "int", 32, 0);
break;
- case TULONG:
- case TLONG:
- case TLONGLONG:
+ case TULONG:
+ case TLONG:
+ case TLONGLONG:
sql_find_subtype(tpe, "bigint", 64, 0);
break;
- case TFLOAT:
- sql_find_subtype(tpe, "real", 32, 0 );
+ case TFLOAT:
+ sql_find_subtype(tpe, "real", 32, 0);
break;
- case TDOUBLE:
- sql_find_subtype(tpe, "double", 51, 0 );
+ case TDOUBLE:
+ sql_find_subtype(tpe, "double", 51, 0);
break;
- /* missing */
- case TCOMPLEX:
- case TDBLCOMPLEX:
- return -1;
- }
- return 1;
+ /* missing */
+ case TCOMPLEX:
+ case TDBLCOMPLEX:
+ return -1;
+ }
+ return 1;
}
str FITSdir(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- str msg = MAL_SUCCEED;
- str dir = *(str*) getArgReference(stk, pci, 1);
- DIR *dp;
- struct dirent *ep;
- fitsfile *fptr;
- char *s;
- int status = 0;
- (void) mb;
+ str msg = MAL_SUCCEED;
+ str dir = *(str*)getArgReference(stk, pci, 1);
+ DIR *dp;
+ struct dirent *ep;
+ fitsfile *fptr;
+ char *s;
+ int status = 0;
+ (void)mb;
- dp = opendir(dir);
- if (dp != NULL) {
- char stmt[BUFSIZ];
- char fname[BUFSIZ];
+ dp = opendir(dir);
+ if (dp != NULL) {
+ char stmt[BUFSIZ];
+ char fname[BUFSIZ];
- s = stmt;
+ s = stmt;
- while ((ep = readdir(dp)) != NULL) {
- snprintf(fname,BUFSIZ,"%s%s",dir,ep->d_name);
- status = 0;
- fits_open_file(&fptr, fname, READONLY, &status);
- if (status == 0) {
- snprintf(stmt, BUFSIZ, ATTACHDIR, fname);
- msg = SQLstatementIntern(cntxt,
&s,"fits.listofdir",TRUE,FALSE);
- fits_close_file(fptr, &status);
- }
- }
- (void) closedir (dp);
- }
- else
- msg = createException(MAL, "listdir", "Couldn't open the directory");
+ while ((ep = readdir(dp)) != NULL) {
+ snprintf(fname, BUFSIZ, "%s%s", dir, ep->d_name);
+ status = 0;
+ fits_open_file(&fptr, fname, READONLY, &status);
+ if (status == 0) {
+ snprintf(stmt, BUFSIZ, ATTACHDIR, fname);
+ msg = SQLstatementIntern(cntxt, &s,
"fits.listofdir", TRUE, FALSE);
+ fits_close_file(fptr, &status);
+ }
+ }
+ (void)closedir(dp);
+ }else
+ msg = createException(MAL, "listdir", "Couldn't open the
directory");
- return msg;
+ return msg;
}
str FITSdirpat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str msg = MAL_SUCCEED;
- str dir = *(str*) getArgReference(stk, pci, 1);
- str pat = *(str*) getArgReference(stk, pci, 2);
+ str dir = *(str*)getArgReference(stk, pci, 1);
+ str pat = *(str*)getArgReference(stk, pci, 2);
fitsfile *fptr;
char *s;
int status = 0;
@@ -265,18 +264,17 @@
char fulldirectory[BUFSIZ];
size_t j = 0;
- (void) mb;
+ (void)mb;
globbuf.gl_offs = 0;
snprintf(fulldirectory, BUFSIZ, "%s%s", dir, pat);
glob(fulldirectory, GLOB_DOOFFS, NULL, &globbuf);
/* mnstr_printf(GDKout,"fulldir: %s \nSize: %lu\n",fulldirectory,
globbuf.gl_pathc);*/
- if (globbuf.gl_pathc == 0)
+ if (globbuf.gl_pathc == 0)
msg = createException(MAL, "listdir", "Couldn't open the
directory or there are no files that match the pattern");
for (j = 0; j < globbuf.gl_pathc; j++) {
-
char stmt[BUFSIZ];
char fname[BUFSIZ];
@@ -286,7 +284,7 @@
fits_open_file(&fptr, fname, READONLY, &status);
if (status == 0) {
snprintf(stmt, BUFSIZ, ATTACHDIR, fname);
- msg = SQLstatementIntern(cntxt,
&s,"fits.listofdirpat",TRUE, FALSE);
+ msg = SQLstatementIntern(cntxt, &s,
"fits.listofdirpat", TRUE, FALSE);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
