Skip to content

Commit 78c0b7d

Browse files
committed
patch 7.4.1206
Problem: Using old style function declarations. Solution: Change to new style function declarations. (script by Hirohito Higashi)
1 parent 7454a06 commit 78c0b7d

8 files changed

Lines changed: 1101 additions & 1674 deletions

File tree

src/ex_cmds.c

Lines changed: 145 additions & 213 deletions
Large diffs are not rendered by default.

src/ex_cmds2.c

Lines changed: 144 additions & 242 deletions
Large diffs are not rendered by default.

src/ex_docmd.c

Lines changed: 322 additions & 519 deletions
Large diffs are not rendered by default.

src/ex_eval.c

Lines changed: 53 additions & 92 deletions
Large diffs are not rendered by default.

src/ex_getln.c

Lines changed: 185 additions & 246 deletions
Large diffs are not rendered by default.

src/farsi.c

Lines changed: 34 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ static void lrswapbuf(char_u *buf, int len);
3838
** Convert the given Farsi character into a _X or _X_ type
3939
*/
4040
static int
41-
toF_Xor_X_(c)
42-
int c;
41+
toF_Xor_X_(int c)
4342
{
4443
int tempc;
4544

@@ -132,8 +131,7 @@ toF_Xor_X_(c)
132131
** Convert the given Farsi character into Farsi capital character .
133132
*/
134133
int
135-
toF_TyA(c)
136-
int c ;
134+
toF_TyA(int c )
137135
{
138136
switch (c)
139137
{
@@ -212,8 +210,7 @@ toF_TyA(c)
212210
** Note: the offset is used only for command line buffer.
213211
*/
214212
static int
215-
F_is_TyB_TyC_TyD(src, offset)
216-
int src, offset;
213+
F_is_TyB_TyC_TyD(int src, int offset)
217214
{
218215
int c;
219216

@@ -264,8 +261,7 @@ F_is_TyB_TyC_TyD(src, offset)
264261
** Is the Farsi character one of the terminating only type.
265262
*/
266263
static int
267-
F_is_TyE(c)
268-
int c;
264+
F_is_TyE(int c)
269265
{
270266
switch (c)
271267
{
@@ -288,8 +284,7 @@ F_is_TyE(c)
288284
** Is the Farsi character one of the none leading type.
289285
*/
290286
static int
291-
F_is_TyC_TyD(c)
292-
int c;
287+
F_is_TyC_TyD(int c)
293288
{
294289
switch (c)
295290
{
@@ -313,8 +308,7 @@ F_is_TyC_TyD(c)
313308
** Convert a none leading Farsi char into a leading type.
314309
*/
315310
static int
316-
toF_TyB(c)
317-
int c;
311+
toF_TyB(int c)
318312
{
319313
switch (c)
320314
{
@@ -337,8 +331,7 @@ toF_TyB(c)
337331
** Overwrite the current redo and cursor characters + left adjust
338332
*/
339333
static void
340-
put_curr_and_l_to_X(c)
341-
int c;
334+
put_curr_and_l_to_X(int c)
342335
{
343336
int tempc;
344337

@@ -372,8 +365,7 @@ put_curr_and_l_to_X(c)
372365
}
373366

374367
static void
375-
put_and_redo(c)
376-
int c;
368+
put_and_redo(int c)
377369
{
378370
pchar_cursor(c);
379371
AppendCharToRedobuff(K_BS);
@@ -384,7 +376,7 @@ put_and_redo(c)
384376
** Change the char. under the cursor to a X_ or X type
385377
*/
386378
static void
387-
chg_c_toX_orX()
379+
chg_c_toX_orX(void)
388380
{
389381
int tempc, curc;
390382

@@ -509,7 +501,7 @@ chg_c_toX_orX()
509501
*/
510502

511503
static void
512-
chg_c_to_X_orX_()
504+
chg_c_to_X_orX_(void)
513505
{
514506
int tempc;
515507

@@ -560,7 +552,7 @@ chg_c_to_X_orX_()
560552
** Change the char. under the cursor to a _X_ or _X type
561553
*/
562554
static void
563-
chg_c_to_X_or_X ()
555+
chg_c_to_X_or_X (void)
564556
{
565557
int tempc;
566558

@@ -591,7 +583,7 @@ chg_c_to_X_or_X ()
591583
** Change the character left to the cursor to a _X_ or X_ type
592584
*/
593585
static void
594-
chg_l_to_X_orX_ ()
586+
chg_l_to_X_orX_ (void)
595587
{
596588
int tempc;
597589

@@ -660,7 +652,7 @@ chg_l_to_X_orX_ ()
660652
*/
661653

662654
static void
663-
chg_l_toXor_X ()
655+
chg_l_toXor_X (void)
664656
{
665657
int tempc;
666658

@@ -729,7 +721,7 @@ chg_l_toXor_X ()
729721
*/
730722

731723
static void
732-
chg_r_to_Xor_X_()
724+
chg_r_to_Xor_X_(void)
733725
{
734726
int tempc, c;
735727

@@ -754,8 +746,7 @@ chg_r_to_Xor_X_()
754746
*/
755747

756748
int
757-
fkmap(c)
758-
int c;
749+
fkmap(int c)
759750
{
760751
int tempc;
761752
static int revins;
@@ -1473,8 +1464,7 @@ fkmap(c)
14731464
** Convert a none leading Farsi char into a leading type.
14741465
*/
14751466
static int
1476-
toF_leading(c)
1477-
int c;
1467+
toF_leading(int c)
14781468
{
14791469
switch (c)
14801470
{
@@ -1528,8 +1518,7 @@ toF_leading(c)
15281518
** Convert a given Farsi char into right joining type.
15291519
*/
15301520
static int
1531-
toF_Rjoin(c)
1532-
int c;
1521+
toF_Rjoin(int c)
15331522
{
15341523
switch (c)
15351524
{
@@ -1585,8 +1574,7 @@ toF_Rjoin(c)
15851574
** Can a given Farsi character join via its left edj.
15861575
*/
15871576
static int
1588-
canF_Ljoin(c)
1589-
int c;
1577+
canF_Ljoin(int c)
15901578
{
15911579
switch (c)
15921580
{
@@ -1660,8 +1648,7 @@ canF_Ljoin(c)
16601648
** Can a given Farsi character join via its right edj.
16611649
*/
16621650
static int
1663-
canF_Rjoin(c)
1664-
int c;
1651+
canF_Rjoin(int c)
16651652
{
16661653
switch (c)
16671654
{
@@ -1689,8 +1676,7 @@ canF_Rjoin(c)
16891676
** is a given Farsi character a terminating type.
16901677
*/
16911678
static int
1692-
F_isterm(c)
1693-
int c;
1679+
F_isterm(int c)
16941680
{
16951681
switch (c)
16961682
{
@@ -1717,8 +1703,7 @@ F_isterm(c)
17171703
** Convert the given Farsi character into a ending type .
17181704
*/
17191705
static int
1720-
toF_ending(c)
1721-
int c;
1706+
toF_ending(int c)
17221707
{
17231708

17241709
switch (c)
@@ -1795,7 +1780,7 @@ toF_ending(c)
17951780
** Convert the Farsi 3342 standard into Farsi VIM.
17961781
*/
17971782
void
1798-
conv_to_pvim()
1783+
conv_to_pvim(void)
17991784
{
18001785
char_u *ptr;
18011786
int lnum, llen, i;
@@ -1844,7 +1829,7 @@ conv_to_pvim()
18441829
* Convert the Farsi VIM into Farsi 3342 standard.
18451830
*/
18461831
void
1847-
conv_to_pstd()
1832+
conv_to_pstd(void)
18481833
{
18491834
char_u *ptr;
18501835
int lnum, llen, i;
@@ -1877,9 +1862,7 @@ conv_to_pstd()
18771862
* left-right swap the characters in buf[len].
18781863
*/
18791864
static void
1880-
lrswapbuf(buf, len)
1881-
char_u *buf;
1882-
int len;
1865+
lrswapbuf(char_u *buf, int len)
18831866
{
18841867
char_u *s, *e;
18851868
int c;
@@ -1901,8 +1884,7 @@ lrswapbuf(buf, len)
19011884
* swap all the characters in reverse direction
19021885
*/
19031886
char_u *
1904-
lrswap(ibuf)
1905-
char_u *ibuf;
1887+
lrswap(char_u *ibuf)
19061888
{
19071889
if (ibuf != NULL && *ibuf != NUL)
19081890
lrswapbuf(ibuf, (int)STRLEN(ibuf));
@@ -1913,9 +1895,7 @@ lrswap(ibuf)
19131895
* swap all the Farsi characters in reverse direction
19141896
*/
19151897
char_u *
1916-
lrFswap(cmdbuf, len)
1917-
char_u *cmdbuf;
1918-
int len;
1898+
lrFswap(char_u *cmdbuf, int len)
19191899
{
19201900
int i, cnt;
19211901

@@ -1945,8 +1925,7 @@ lrFswap(cmdbuf, len)
19451925
* TODO: handle different separator characters. Use skip_regexp().
19461926
*/
19471927
char_u *
1948-
lrF_sub(ibuf)
1949-
char_u *ibuf;
1928+
lrF_sub(char_u *ibuf)
19501929
{
19511930
char_u *p, *ep;
19521931
int i, cnt;
@@ -1986,8 +1965,7 @@ lrF_sub(ibuf)
19861965
* Map Farsi keyboard when in cmd_fkmap mode.
19871966
*/
19881967
int
1989-
cmdl_fkmap(c)
1990-
int c;
1968+
cmdl_fkmap(int c)
19911969
{
19921970
int tempc;
19931971

@@ -2246,8 +2224,7 @@ cmdl_fkmap(c)
22462224
* F_isalpha returns TRUE if 'c' is a Farsi alphabet
22472225
*/
22482226
int
2249-
F_isalpha(c)
2250-
int c;
2227+
F_isalpha(int c)
22512228
{
22522229
return (( c >= TEE_ && c <= _YE)
22532230
|| (c >= ALEF_A && c <= YE)
@@ -2258,8 +2235,7 @@ F_isalpha(c)
22582235
* F_isdigit returns TRUE if 'c' is a Farsi digit
22592236
*/
22602237
int
2261-
F_isdigit(c)
2262-
int c;
2238+
F_isdigit(int c)
22632239
{
22642240
return (c >= FARSI_0 && c <= FARSI_9);
22652241
}
@@ -2268,15 +2244,14 @@ F_isdigit(c)
22682244
* F_ischar returns TRUE if 'c' is a Farsi character.
22692245
*/
22702246
int
2271-
F_ischar(c)
2272-
int c;
2247+
F_ischar(int c)
22732248
{
2274-
return (c >= TEE_ && c <= YE_);
2249+
return (c >= TEE_ && c <= YE_);
22752250
}
22762251

22772252
void
2278-
farsi_fkey(cap)
2279-
cmdarg_T *cap;
2253+
farsi_fkey(
2254+
cmdarg_T *cap)
22802255
{
22812256
int c = cap->cmdchar;
22822257

0 commit comments

Comments
 (0)