Mercurial > vim

comparison src/blob.c @ 26877:06a137af96f8 v8.2.3967

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3967: error messages are spread out Commit: https://github.com/vim/vim/commit/460ae5dfca31fa627531c263184849976755cf6b Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 1 14:19:49 2022 +0000 patch 8.2.3967: error messages are spread out Problem: Error messages are spread out. Solution: Move more errors to errors.h.
author Bram Moolenaar <Bram@vim.org>
date Sat, 01 Jan 2022 15:30:05 +0100
parents bce848ec8b1b
children 41e0dcf38521
comparison
equal deleted inserted replaced
26876:601a973ac16c 26877:06a137af96f8
348 rettv->v_type = VAR_NUMBER; 348 rettv->v_type = VAR_NUMBER;
349 rettv->vval.v_number = v; 349 rettv->vval.v_number = v;
350 } 350 }
351 else 351 else
352 { 352 {
353 semsg(_(e_blobidx), n1); 353 semsg(_(e_blob_index_out_of_range_nr), n1);
354 return FAIL; 354 return FAIL;
355 } 355 }
356 } 356 }
357 return OK; 357 return OK;
358 } 358 }
364 check_blob_index(long bloblen, varnumber_T n1, int quiet) 364 check_blob_index(long bloblen, varnumber_T n1, int quiet)
365 { 365 {
366 if (n1 < 0 || n1 > bloblen) 366 if (n1 < 0 || n1 > bloblen)
367 { 367 {
368 if (!quiet) 368 if (!quiet)
369 semsg(_(e_blobidx), n1); 369 semsg(_(e_blob_index_out_of_range_nr), n1);
370 return FAIL; 370 return FAIL;
371 } 371 }
372 return OK; 372 return OK;
373 } 373 }
374 374
379 check_blob_range(long bloblen, varnumber_T n1, varnumber_T n2, int quiet) 379 check_blob_range(long bloblen, varnumber_T n1, varnumber_T n2, int quiet)
380 { 380 {
381 if (n2 < 0 || n2 >= bloblen || n2 < n1) 381 if (n2 < 0 || n2 >= bloblen || n2 < n1)
382 { 382 {
383 if (!quiet) 383 if (!quiet)
384 semsg(_(e_blobidx), n2); 384 semsg(_(e_blob_index_out_of_range_nr), n2);
385 return FAIL; 385 return FAIL;
386 } 386 }
387 return OK; 387 return OK;
388 } 388 }
389 389
463 if (idx < 0) 463 if (idx < 0)
464 // count from the end 464 // count from the end
465 idx = len + idx; 465 idx = len + idx;
466 if (idx < 0 || idx >= len) 466 if (idx < 0 || idx >= len)
467 { 467 {
468 semsg(_(e_blobidx), idx); 468 semsg(_(e_blob_index_out_of_range_nr), idx);
469 return; 469 return;
470 } 470 }
471 if (argvars[2].v_type == VAR_UNKNOWN) 471 if (argvars[2].v_type == VAR_UNKNOWN)
472 { 472 {
473 // Remove one item, return its value. 473 // Remove one item, return its value.
485 if (end < 0) 485 if (end < 0)
486 // count from the end 486 // count from the end
487 end = len + end; 487 end = len + end;
488 if (end >= len || idx > end) 488 if (end >= len || idx > end)
489 { 489 {
490 semsg(_(e_blobidx), end); 490 semsg(_(e_blob_index_out_of_range_nr), end);
491 return; 491 return;
492 } 492 }
493 newblob = blob_alloc(); 493 newblob = blob_alloc();
494 if (newblob == NULL) 494 if (newblob == NULL)
495 return; 495 return;
561 || did_emsg) 561 || did_emsg)
562 break; 562 break;
563 if (newtv.v_type != VAR_NUMBER && newtv.v_type != VAR_BOOL) 563 if (newtv.v_type != VAR_NUMBER && newtv.v_type != VAR_BOOL)
564 { 564 {
565 clear_tv(&newtv); 565 clear_tv(&newtv);
566 emsg(_(e_invalblob)); 566 emsg(_(e_invalid_operation_for_blob));
567 break; 567 break;
568 } 568 }
569 if (filtermap != FILTERMAP_FILTER) 569 if (filtermap != FILTERMAP_FILTER)
570 { 570 {
571 if (newtv.vval.v_number != val) 571 if (newtv.vval.v_number != val)
658 658
659 if (argvars[2].v_type == VAR_UNKNOWN) 659 if (argvars[2].v_type == VAR_UNKNOWN)
660 { 660 {
661 if (b == NULL || b->bv_ga.ga_len == 0) 661 if (b == NULL || b->bv_ga.ga_len == 0)
662 { 662 {
663 semsg(_(e_reduceempty), "Blob"); 663 semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "Blob");
664 return; 664 return;
665 } 665 }
666 initial.v_type = VAR_NUMBER; 666 initial.v_type = VAR_NUMBER;
667 initial.vval.v_number = blob_get(b, 0); 667 initial.vval.v_number = blob_get(b, 0);
668 i = 1; 668 i = 1;