[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta [POSSIBLY UNSAFE]
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-05-31 17:42:13
[Download RAW message or body]

CVS commit by mueller: 

its getting closer to be compilable


  A            kssl-smime/.cvsignore   1.1
  A            kssl-smime/plugin/.cvsignore   1.1
  M +3 -3      kpoker/lib/server/pokertester.cpp   1.13
  M +1 -1      kpoker/lib/server/server.cpp   1.59
  M +13 -14    ksblive/lib/debug.c   1.3 [POSSIBLY UNSAFE: printf]
  M +0 -1      ksciplot/ksciplot/ksciplot_view.h   1.15
  M +2 -2      kssl-smime/plugin/Makefile.am   1.2


--- kdenonbeta/kpoker/lib/server/pokertester.cpp  #1.12:1.13
@@ -30,8 +30,8 @@
 //general includes
 #include <stdlib.h>
-#include <math.h> // pow()
+#include <cmath> // pow()
 
 
-#define POINTS_SEPARATOR 15 // used by calculatePoints -> must be > 12 (52/4)
+#define POINTS_SEPARATOR 15.0 // used by calculatePoints -> must be > 12 (52/4)
 #define RESULT_SEPARATOR 1000000 // must be > pow(POINTS_SEPARATOR, CARDS)
 
@@ -353,5 +353,5 @@ unsigned long int PokerTester::calculate
  unsigned long int points = 0;
  while (!sortedCardValues.empty()) {
-        points += sortedCardValues[0] * (unsigned long int)pow(POINTS_SEPARATOR, \
sortedCardValues.size() - 1); +        points += sortedCardValues[0] * (unsigned long \
int)pow(POINTS_SEPARATOR, double( sortedCardValues.size() - 1 ));  \
sortedCardValues.remove(sortedCardValues.begin());  }

--- kdenonbeta/kpoker/lib/server/server.cpp  #1.58:1.59
@@ -473,5 +473,5 @@ bool Server::playerInput(QDataStream& st
 //              }
                 kdDebug(12001) << "player " << p->id() << " would raise " 
-                                << raise << " if it was implemented" 
+                                << ( unsigned long ) raise << " if it was \
implemented"   << endl;
         }

--- kdenonbeta/ksblive/lib/debug.c  #1.2:1.3
@@ -325,18 +325,17 @@ void print_summary(struct dsp_patch_mana
                         k=i;
         }
-        printf("\
-Usage Summary:
---------
-Instructions : %d
-GPRS:          %d (last used is %d)
-
-Tram
- Internal
-   buffers:    %d
-   space  :    0x%06x
- External
-   buffers:    %d
-   space  :    0x%06x
-",
+        printf("Usage Summary:\n" 
+"--------\n"
+"Instructions : %d\n"
+"GPRS:          %d (last used is %d)\n"
+"\n"
+"Tram\n"
+" Internal\n"
+"   buffers:    %d\n"
+"   space  :    0x%06x\n"
+" External\n"
+"   buffers:    %d\n"
+"   space  :    0x%06x\n"
+,
                mgr->code_free_start/2, j,k,
                mgr->traml_ifree_start,  mgr->tramb_ifree_start,

--- kdenonbeta/ksciplot/ksciplot/ksciplot_view.h  #1.14:1.15
@@ -9,5 +9,4 @@ class QPaintEvent;
 
 class KSciPlotPart;
-struct KSciPlotPart_Payload;
 
 class KSciPlotView : public KoView

--- kdenonbeta/kssl-smime/plugin/Makefile.am  #1.1.1.1:1.2
@@ -4,6 +4,6 @@
 
 kssl_smime_la_SOURCES = ksmimeinterface.cc ksmimeinterface_c.cc
-kssl_smime_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT)
-kssl_smime_la_LDFLAGS = -module $(KDE_PLUGIN)
+kssl_smime_la_LIBADD = $(LIB_KIO)
+kssl_smime_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 METASOURCES = AUTO


[prev in list] [next in list] [prev in thread] [next in thread]