mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

140 lines
3.5 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/e17/efsd/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- efsd-2004-02-25/efsd/libefsd.c.orig 2004-05-13 18:40:26.982917168 +0200
  20. +++ efsd-2004-02-25/efsd/libefsd.c 2004-05-13 18:42:10.480183192 +0200
  21. @@ -1392,6 +1392,7 @@
  22. break;
  23. case EFSD_CMD_CLOSE:
  24. default:
  25. + ;
  26. }
  27. D_RETURN_(NULL);
  28. @@ -1441,6 +1442,7 @@
  29. break;
  30. case EFSD_CMD_CLOSE:
  31. default:
  32. + ;
  33. }
  34. D_RETURN_(-1);
  35. @@ -1464,6 +1466,7 @@
  36. D_RETURN_(ee->efsd_metachange_event.data);
  37. break;
  38. default:
  39. + ;
  40. }
  41. D_RETURN_(NULL);
  42. --- efsd-2004-02-25/efsd/efsd_main.c.orig 2004-05-13 18:43:42.328220168 +0200
  43. +++ efsd-2004-02-25/efsd/efsd_main.c 2004-05-13 18:46:00.131270920 +0200
  44. @@ -417,7 +417,7 @@
  45. {
  46. if (errno == EINTR)
  47. {
  48. - D(__FUNCTION__ " select() interrupted\n");
  49. + D("%s select() interrupted\n", __FUNCTION__);
  50. FD_ZERO(&fdrset);
  51. FD_SET(famcon.fd, &fdrset);
  52. fdsize = famcon.fd;
  53. @@ -429,7 +429,7 @@
  54. }
  55. else
  56. {
  57. - fprintf(stderr, __FUNCTION__ ": select error -- exiting.\n");
  58. + fprintf(stderr, "%s: select error -- exiting.\n", __FUNCTION__);
  59. perror("Mhmmm");
  60. exit(-1);
  61. }
  62. @@ -501,6 +501,7 @@
  63. efsd_dca_remove(m->files, famev.filename);
  64. break;
  65. default:
  66. + ;
  67. }
  68. for (cl = efsd_list_head(m->clients); cl; cl = efsd_list_next(cl))
  69. @@ -522,6 +523,7 @@
  70. sort_files = TRUE;
  71. break;
  72. default:
  73. + ;
  74. }
  75. }
  76. @@ -777,7 +779,7 @@
  77. {
  78. if (errno == EINTR)
  79. {
  80. - D(__FUNCTION__ " select() interrupted\n");
  81. + D("%s select() interrupted\n", __FUNCTION__);
  82. FD_ZERO(&fdrset);
  83. --- efsd-2004-02-25/efsd/efsd_filetype.c.orig 2004-05-13 18:42:58.746845544 +0200
  84. +++ efsd-2004-02-25/efsd/efsd_filetype.c 2004-05-13 18:43:10.975986432 +0200
  85. @@ -1333,6 +1333,7 @@
  86. }
  87. break;
  88. default:
  89. + ;
  90. }
  91. D_RETURN_(NULL);
  92. --- efsd-2004-02-25/efsd/efsd_monitor.c.orig 2004-05-13 18:46:39.883227704 +0200
  93. +++ efsd-2004-02-25/efsd/efsd_monitor.c 2004-05-13 18:46:51.289493688 +0200
  94. @@ -358,6 +358,7 @@
  95. sort_files = TRUE;
  96. break;
  97. default:
  98. + ;
  99. }
  100. }
  101. --- efsd-2004-02-25/tools/efsdsh.c.orig 2004-05-13 18:47:40.042082168 +0200
  102. +++ efsd-2004-02-25/tools/efsdsh.c 2004-05-13 18:48:24.588310112 +0200
  103. @@ -223,6 +223,7 @@
  104. efsd_metadata_get_str(ee));
  105. break;
  106. default:
  107. + ;
  108. }
  109. }
  110. break;
  111. @@ -353,9 +354,11 @@
  112. efsd_metadata_get_str(ee));
  113. break;
  114. default:
  115. + ;
  116. }
  117. }
  118. default:
  119. + ;
  120. }
  121. /* Cleanup memory allocated for this event */
  122. @@ -373,6 +376,7 @@
  123. printf("Broken pipe caught.\n");
  124. break;
  125. default:
  126. + ;
  127. }
  128. exit(-1);