080a160c7b9595d516c9c70e83689a09b60839d0 galt Mon Jun 3 12:16:53 2013 -0700 fix SQL Injection diff --git src/inc/psl.h src/inc/psl.h index 5e01ab2..0557228 100644 --- src/inc/psl.h +++ src/inc/psl.h @@ -19,33 +19,30 @@ #ifndef FUZZYFIND_H #include "fuzzyFind.h" #endif #ifndef DNASEQ_H #include "dnaseq.h" #endif /* Some forward declarations of structures used but not defined here. */ struct rbTree; #define PSL_NUM_COLS 21 /* number of columns in a PSL */ #define PSLX_NUM_COLS 23 /* number of columns in a PSLX */ -/* Options to pslGetCreateSql */ -#define PSL_TNAMEIX 0x01 /* create target name index */ -#define PSL_WITH_BIN 0x02 /* add bin column */ #define PSL_XA_FORMAT 0x04 /* add XA format columns */ /* options for pslFromAlign */ #define PSL_IS_SOFTMASK 0x01 /* lower case are mask */ struct psl /* Summary info about a patSpace alignment */ { struct psl *next; /* Next in singly linked list. */ unsigned match; /* Number of bases that match that aren't repeats */ unsigned misMatch; /* Number of bases that don't match */ unsigned repMatch; /* Number of bases that match but are part of repeats */ unsigned nCount; /* Number of 'N' bases */ unsigned qNumInsert; /* Number of inserts in query */ int qBaseInsert; /* Number of bases inserted in query */ @@ -234,37 +231,30 @@ void pslTargetOffset(struct psl *psl, int offset); /* Add offset to target positions in psl. */ void pslDump(struct psl *psl, FILE *f); /* Dump most of PSL to file - for debugging. */ struct psl *pslTrimToTargetRange(struct psl *oldPsl, int tMin, int tMax); /* Return psl trimmed to fit inside tMin/tMax. Note this does not * update the match/misMatch and related fields. */ struct psl *pslTrimToQueryRange(struct psl *oldPsl, int qMin, int qMax); /* Return psl trimmed to fit inside qMin/qMax. Note this does not * update the match/misMatch and related fields. */ -char* pslGetCreateSql(char* table, unsigned options, int tNameIdxLen); -/* Get SQL required to create PSL table. Options is a bit set consisting - * of PSL_TNAMEIX, PSL_WITH_BIN, and PSL_XA_FORMAT. tNameIdxLen is - * the number of characters in target name to index. If greater than - * zero, must specify PSL_TNAMEIX. If zero and PSL_TNAMEIX is specified, - * to will default to 8. */ - int pslCheck(char *pslDesc, FILE* out, struct psl* psl); /* Validate a PSL for consistency. pslDesc is printed the error messages * to file out (open /dev/null to discard). Return count of errors. */ int pslCountBlocks(struct psl *target, struct psl *query, int maxBlockGap); /* count the number of blocks in the query that overlap the target */ /* merge blocks that are closer than maxBlockGap */ struct hash *readPslToBinKeeper(char *sizeFileName, char *pslFileName); /* read a list of psls and return results in hash of binKeeper structure for fast query*/ boolean pslIsProtein(const struct psl *psl); /* is psl a protein psl (are it's blockSizes and scores in protein space) */ struct psl* pslFromAlign(char *qName, int qSize, int qStart, int qEnd, char *qString,