Browse code

avformat/ftp: make const tables static const

Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/08/05 05:27:02
Showing 1 changed files
... ...
@@ -197,8 +197,8 @@ static int ftp_auth(FTPContext *s)
197 197
     const char *user = NULL, *pass = NULL;
198 198
     char *end = NULL, buf[CONTROL_BUFFER_SIZE], credencials[CREDENTIALS_BUFFER_SIZE];
199 199
     int err;
200
-    const int user_codes[] = {331, 230, 500, 530, 0}; /* 500, 530 are incorrect codes */
201
-    const int pass_codes[] = {230, 503, 530, 0}; /* 503, 530 are incorrect codes */
200
+    static const int user_codes[] = {331, 230, 500, 530, 0}; /* 500, 530 are incorrect codes */
201
+    static const int pass_codes[] = {230, 503, 530, 0}; /* 503, 530 are incorrect codes */
202 202
 
203 203
     /* Authentication may be repeated, original string has to be saved */
204 204
     av_strlcpy(credencials, s->credencials, sizeof(credencials));
... ...
@@ -230,8 +230,8 @@ static int ftp_passive_mode(FTPContext *s)
230 230
 {
231 231
     char *res = NULL, *start = NULL, *end = NULL;
232 232
     int i;
233
-    const char *command = "PASV\r\n";
234
-    const int pasv_codes[] = {227, 501, 0}; /* 501 is incorrect code */
233
+    static const char *command = "PASV\r\n";
234
+    static const int pasv_codes[] = {227, 501, 0}; /* 501 is incorrect code */
235 235
 
236 236
     if (ftp_send_command(s, command, pasv_codes, &res) != 227 || !res)
237 237
         goto fail;
... ...
@@ -276,8 +276,8 @@ static int ftp_current_dir(FTPContext *s)
276 276
 {
277 277
     char *res = NULL, *start = NULL, *end = NULL;
278 278
     int i;
279
-    const char *command = "PWD\r\n";
280
-    const int pwd_codes[] = {257, 0};
279
+    static const char *command = "PWD\r\n";
280
+    static const int pwd_codes[] = {257, 0};
281 281
 
282 282
     if (ftp_send_command(s, command, pwd_codes, &res) != 257 || !res)
283 283
         goto fail;
... ...
@@ -314,7 +314,7 @@ static int ftp_file_size(FTPContext *s)
314 314
 {
315 315
     char command[CONTROL_BUFFER_SIZE];
316 316
     char *res = NULL;
317
-    const int size_codes[] = {213, 501, 550, 0}; /* 501, 550 are incorrect codes */
317
+    static const int size_codes[] = {213, 501, 550, 0}; /* 501, 550 are incorrect codes */
318 318
 
319 319
     snprintf(command, sizeof(command), "SIZE %s\r\n", s->path);
320 320
     if (ftp_send_command(s, command, size_codes, &res) == 213 && res) {
... ...
@@ -332,7 +332,7 @@ static int ftp_file_size(FTPContext *s)
332 332
 static int ftp_retrieve(FTPContext *s)
333 333
 {
334 334
     char command[CONTROL_BUFFER_SIZE];
335
-    const int retr_codes[] = {150, 550, 554, 0}; /* 550, 554 are incorrect codes */
335
+    static const int retr_codes[] = {150, 550, 554, 0}; /* 550, 554 are incorrect codes */
336 336
 
337 337
     snprintf(command, sizeof(command), "RETR %s\r\n", s->path);
338 338
     if (ftp_send_command(s, command, retr_codes, NULL) != 150)
... ...
@@ -346,7 +346,7 @@ static int ftp_retrieve(FTPContext *s)
346 346
 static int ftp_store(FTPContext *s)
347 347
 {
348 348
     char command[CONTROL_BUFFER_SIZE];
349
-    const int stor_codes[] = {150, 0};
349
+    static const int stor_codes[] = {150, 0};
350 350
 
351 351
     snprintf(command, sizeof(command), "STOR %s\r\n", s->path);
352 352
     if (ftp_send_command(s, command, stor_codes, NULL) != 150)
... ...
@@ -359,8 +359,8 @@ static int ftp_store(FTPContext *s)
359 359
 
360 360
 static int ftp_type(FTPContext *s)
361 361
 {
362
-    const char *command = "TYPE I\r\n";
363
-    const int type_codes[] = {200, 500, 504, 0}; /* 500, 504 are incorrect codes */
362
+    static const char *command = "TYPE I\r\n";
363
+    static const int type_codes[] = {200, 500, 504, 0}; /* 500, 504 are incorrect codes */
364 364
 
365 365
     if (ftp_send_command(s, command, type_codes, NULL) != 200)
366 366
         return AVERROR(EIO);
... ...
@@ -371,7 +371,7 @@ static int ftp_type(FTPContext *s)
371 371
 static int ftp_restart(FTPContext *s, int64_t pos)
372 372
 {
373 373
     char command[CONTROL_BUFFER_SIZE];
374
-    const int rest_codes[] = {350, 500, 501, 0}; /* 500, 501 are incorrect codes */
374
+    static const int rest_codes[] = {350, 500, 501, 0}; /* 500, 501 are incorrect codes */
375 375
 
376 376
     snprintf(command, sizeof(command), "REST %"PRId64"\r\n", pos);
377 377
     if (ftp_send_command(s, command, rest_codes, NULL) != 350)
... ...
@@ -386,7 +386,7 @@ static int ftp_connect_control_connection(URLContext *h)
386 386
     int err;
387 387
     AVDictionary *opts = NULL;
388 388
     FTPContext *s = h->priv_data;
389
-    const int connect_codes[] = {220, 0};
389
+    static const int connect_codes[] = {220, 0};
390 390
 
391 391
     if (!s->conn_control) {
392 392
         ff_url_join(buf, sizeof(buf), "tcp", NULL,
... ...
@@ -462,9 +462,9 @@ static int ftp_connect_data_connection(URLContext *h)
462 462
 
463 463
 static int ftp_abort(URLContext *h)
464 464
 {
465
-    const char *command = "ABOR\r\n";
465
+    static const char *command = "ABOR\r\n";
466 466
     int err;
467
-    const int abor_codes[] = {225, 226, 0};
467
+    static const int abor_codes[] = {225, 226, 0};
468 468
     FTPContext *s = h->priv_data;
469 469
 
470 470
     /* According to RCF 959: