mummer-3.23-fix-c++-qa.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. --- a/src/kurtz/libbasedir/space.c
  2. +++ b/src/kurtz/libbasedir/space.c
  3. @@ -379,7 +379,7 @@
  4. }
  5. if(numberofblocks > 0)
  6. {
  7. - fprintf(stderr,"space leak: number of blocks = %u\n",numberofblocks);
  8. + fprintf(stderr,"space leak: number of blocks = %lu\n",numberofblocks);
  9. exit(EXIT_FAILURE);
  10. }
  11. free(blocks);
  12. --- a/src/tigr/combineMUMs.cc
  13. +++ b/src/tigr/combineMUMs.cc
  14. @@ -106,7 +106,7 @@
  15. // This array [i] is the maximum number of errors allowed
  16. // in a match between sequences of length i , which is
  17. // i * MAXERROR_RATE .
  18. -char * Error_File_Name = DEFAULT_ERROR_FILE_NAME;
  19. +const char * Error_File_Name = DEFAULT_ERROR_FILE_NAME;
  20. // Name of file to write gaps listing with # errors in each gap
  21. int Fill_Ct = 0;
  22. // Number of non-acgt bases in ref sequence
  23. @@ -132,7 +132,7 @@
  24. // The query sequence
  25. long int Query_Len;
  26. // The length of the query sequence
  27. -char * Query_Suffix = "Query";
  28. +const char * Query_Suffix = "Query";
  29. // Suffix for query tag
  30. char * Ref = NULL;
  31. // The reference sequence
  32. @@ -142,7 +142,7 @@
  33. // The length of the reference sequence
  34. long int Ref_Size;
  35. // The size of the reference sequence buffer
  36. -char * Ref_Suffix = "Ref";
  37. +const char * Ref_Suffix = "Ref";
  38. // Suffix for reference tag
  39. int Show_Differences = FALSE;
  40. // If TRUE then show differences in all alignments
  41. --- a/src/tigr/mgaps.cc
  42. +++ b/src/tigr/mgaps.cc
  43. @@ -64,9 +64,9 @@
  44. static void Parse_Command_Line
  45. (int argc, char * argv []);
  46. static void Process_Matches
  47. - (Match_t * A, int N, char * label);
  48. + (Match_t * A, int N, const char * label);
  49. static int Process_Cluster
  50. - (Match_t * A, int N, char * label);
  51. + (Match_t * A, int N, const char * label);
  52. static void Union
  53. (int a, int b);
  54. static void Usage
  55. @@ -438,7 +438,7 @@
  56. static int Process_Cluster
  57. - (Match_t * A, int N, char * label)
  58. + (Match_t * A, int N, const char * label)
  59. // Process the cluster of matches in A [0 .. (N - 1)] and output them
  60. // after a line containing label . Return the number of clusters
  61. @@ -552,7 +552,7 @@
  62. static void Process_Matches
  63. - (Match_t * A, int N, char * label)
  64. + (Match_t * A, int N, const char * label)
  65. // Process matches A [1 .. N] and output them after
  66. // a line containing label .
  67. --- a/src/tigr/show-coords.cc
  68. +++ b/src/tigr/show-coords.cc
  69. @@ -788,7 +788,7 @@
  70. (vector<AlignStats> Stats)
  71. {
  72. time_t currtime;
  73. - char * type;
  74. + const char * type;
  75. char date[MAX_LINE];
  76. long int len;
  77. vector<AlignStats>::iterator Sip;