summaryrefslogtreecommitdiff
authorerik <erik>2007-01-24 19:57:51 (UTC)
committer erik <erik>2007-01-24 19:57:51 (UTC)
commit48d9219a96096cf44df8ac24413b36d1b718b1d5 (patch) (unidiff)
treeef49f0d2b778283221ebbb8634f1a59710ddd108
parent89e81059e832ff77c2f0ac8b9db12f80eafa03fc (diff)
downloadopie-48d9219a96096cf44df8ac24413b36d1b718b1d5.zip
opie-48d9219a96096cf44df8ac24413b36d1b718b1d5.tar.gz
opie-48d9219a96096cf44df8ac24413b36d1b718b1d5.tar.bz2
Each file in this commit has the issue where a function can return a
negative result but the result is used in a context that can only be positive.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/kpacman/score.cpp4
-rw-r--r--noncore/todayplugins/stockticker/libstocks/http.c95
2 files changed, 49 insertions, 50 deletions
diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp
index 6878b81..737f03b 100644
--- a/noncore/games/kpacman/score.cpp
+++ b/noncore/games/kpacman/score.cpp
@@ -238,13 +238,13 @@ void Score::keyPressEvent(QKeyEvent *k)
238 end(); 238 end();
239 } 239 }
240 240
241 if (x != cursor.x || y != cursor.y) { 241 if (x != cursor.x || y != cursor.y) {
242 if (cursor.x != -1) 242 if (cursor.x != -1 && lastScore >= 0)
243 cursor.chr = hallOfFame[lastScore].name.at(cursor.x-14); 243 cursor.chr = hallOfFame[lastScore].name.at(cursor.x-14);
244 scrollRepeat = FALSE; 244 scrollRepeat = FALSE;
245 repaint(rect(x, y*1.25, cursor.chr), FALSE); 245 repaint(rect(x, y*1.25, cursor.chr), FALSE);
246 } else 246 } else if (lastScore >= 0)
247 hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr; 247 hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr;
248 248
249 if (key == UpKey || key == Key_Up || key == DownKey || key == Key_Down) 249 if (key == UpKey || key == Key_Up || key == DownKey || key == Key_Down)
250 scrollRepeat = TRUE; 250 scrollRepeat = TRUE;
diff --git a/noncore/todayplugins/stockticker/libstocks/http.c b/noncore/todayplugins/stockticker/libstocks/http.c
index cc78ab7..155ce4b 100644
--- a/noncore/todayplugins/stockticker/libstocks/http.c
+++ b/noncore/todayplugins/stockticker/libstocks/http.c
@@ -83,21 +83,20 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
83 memmove((char *) &server.sin_addr, host->h_addr, host->h_length); 83 memmove((char *) &server.sin_addr, host->h_addr, host->h_length);
84 server.sin_family = host->h_addrtype; 84 server.sin_family = host->h_addrtype;
85 server.sin_port = (unsigned short) htons( http_proxy_server ? http_proxy_port : 80 ); 85 server.sin_port = (unsigned short) htons( http_proxy_server ? http_proxy_port : 80 );
86 86
87 } else 87 }
88 { 88 else
89 89 {
90#ifdef DEBUG 90#ifdef DEBUG
91 printf(" gethostbyname : NOK\n"); 91 printf(" gethostbyname : NOK\n");
92#endif 92#endif
93 return ERRHOST; 93 return ERRHOST;
94 } 94 }
95 95
96 /* create socket */ 96 /* create socket */
97 if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) 97 if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
98 { 98 {
99
100#ifdef DEBUG 99#ifdef DEBUG
101 printf(" create socket : NOK\n"); 100 printf(" create socket : NOK\n");
102#endif 101#endif
103 return ERRSOCK; 102 return ERRSOCK;
@@ -123,9 +122,9 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
123 /* create header */ 122 /* create header */
124 if (http_proxy_server) 123 if (http_proxy_server)
125 { 124 {
126 sprintf(header,"GET http://%.128s:80%.256s HTTP/1.0\015\012\015\012", 125 sprintf(header,"GET http://%.128s:80%.256s HTTP/1.0\015\012\015\012",
127 http_server, http_file); 126 http_server, http_file);
128 } 127 }
129 else 128 else
130 { 129 {
131 sprintf(header,"GET %s HTTP/1.0\015\012\015\012",http_file); 130 sprintf(header,"GET %s HTTP/1.0\015\012\015\012",http_file);
@@ -140,9 +139,9 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
140 if (send(s,header,hlg, 0)!=hlg) 139 if (send(s,header,hlg, 0)!=hlg)
141#endif 140#endif
142 { 141 {
143#ifdef DEBUG 142#ifdef DEBUG
144 printf(" send header : NOK\n"); 143 printf(" send header : NOK\n");
145#endif 144#endif
146 return ERRWHEA; 145 return ERRWHEA;
147 } 146 }
148 147
@@ -158,39 +157,39 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
158#elif __WINDOWS__ 157#elif __WINDOWS__
159 r=recv(s,buf,BUF_SIZE,0); 158 r=recv(s,buf,BUF_SIZE,0);
160#endif 159#endif
161 160
162 if (r) 161 if (r > 0)
163 { 162 {
164 if(!data_lgr) 163 if(!data_lgr)
165 { 164 {
166 if((data = malloc(r+1))==NULL) 165 if((data = malloc(r+1))==NULL)
167 { 166 {
168 fprintf(stderr,"Memory allocating error (%s line %d)\n" 167 fprintf(stderr,"Memory allocating error (%s line %d)\n",
169 ,__FILE__, __LINE__); 168 __FILE__, __LINE__);
170 exit(1); 169 exit(1);
171 } 170 }
172 171
173 memcpy(data,buf,r); 172 memcpy(data,buf,r);
174 data_lgr = r; 173 data_lgr = r;
175 data[r]=0; 174 data[r]=0;
176 } 175 }
177 else 176 else
178 { 177 {
179 if((temp = malloc(r+data_lgr+1))==NULL) 178 if((temp = malloc(r+data_lgr+1))==NULL)
180 { 179 {
181 fprintf(stderr,"Memory allocating error (%s line %d)\n" 180 fprintf(stderr,"Memory allocating error (%s line %d)\n",
182 ,__FILE__, __LINE__); 181 __FILE__, __LINE__);
183 exit(1); 182 exit(1);
184 } 183 }
185 memcpy(temp, data, data_lgr); 184 memcpy(temp, data, data_lgr);
186 memcpy(temp+data_lgr, buf, r); 185 memcpy(temp+data_lgr, buf, r);
187 temp[r+data_lgr]=0; 186 temp[r+data_lgr]=0;
188 data_lgr += r; 187 data_lgr += r;
189 free(data); 188 free(data);
190 data = temp; 189 data = temp;
191 } 190 }
192 } 191 }
193 } 192 }
194 193
195 /* close socket */ 194 /* close socket */
196#ifdef __UNIX__ 195#ifdef __UNIX__
@@ -212,16 +211,16 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
212 { 211 {
213 if (!temp || *temp==0) return ERRRHEA; 212 if (!temp || *temp==0) return ERRRHEA;
214 213
215 if( *temp==0x0A ) 214 if( *temp==0x0A )
216 { 215 {
217 /* test if it is the header end */ 216 /* test if it is the header end */
218 temp ++; 217 temp ++;
219 if (*temp == 0x0D) temp++; 218 if (*temp == 0x0D) temp++;
220 if (*temp == 0x0A) header_founded = 1; 219 if (*temp == 0x0A) header_founded = 1;
221 } 220 }
222 else 221 else
223 temp++; 222 temp++;
224 } 223 }
225 224
226 *temp = 0; 225 *temp = 0;
227 temp++; 226 temp++;
@@ -239,10 +238,10 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
239 238
240 if ((csv_ptr = malloc(strlen(temp)+1))==NULL) 239 if ((csv_ptr = malloc(strlen(temp)+1))==NULL)
241 { 240 {
242 free(data); 241 free(data);
243 fprintf(stderr,"Memory allocating error (%s line %d)\n" 242 fprintf(stderr,"Memory allocating error (%s line %d)\n",
244 ,__FILE__, __LINE__); 243 __FILE__, __LINE__);
245 exit(1); 244 exit(1);
246 } 245 }
247 246
248 memcpy(csv_ptr, temp, strlen(temp)+1); 247 memcpy(csv_ptr, temp, strlen(temp)+1);