Skip to content

Commit c3e0569

Browse files
gekygeky
committed
callback - Fixed parameter misname
Problematic line: memcpy(&_func, obj, sizeof obj); Should be: memcpy(&_func, method, sizeof method); Introduced during renaming of callback arguments for clarity: #2794
1 parent 93e9b48 commit c3e0569

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

‎hal/api/Callback.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ class Callback<R()> {
291291
};
292292

293293
memset(&_func, 0, sizeof _func);
294-
memcpy(&_func, &obj, sizeof obj);
294+
memcpy(&_func, &method, sizeof method);
295295
_obj = (void*)obj;
296296
_thunk = &local::_thunk;
297297
}
@@ -311,7 +311,7 @@ class Callback<R()> {
311311
};
312312

313313
memset(&_func, 0, sizeof _func);
314-
memcpy(&_func, &obj, sizeof obj);
314+
memcpy(&_func, &method, sizeof method);
315315
_obj = (void*)obj;
316316
_thunk = &local::_thunk;
317317
}
@@ -331,7 +331,7 @@ class Callback<R()> {
331331
};
332332

333333
memset(&_func, 0, sizeof _func);
334-
memcpy(&_func, &obj, sizeof obj);
334+
memcpy(&_func, &method, sizeof method);
335335
_obj = (void*)obj;
336336
_thunk = &local::_thunk;
337337
}
@@ -351,7 +351,7 @@ class Callback<R()> {
351351
};
352352

353353
memset(&_func, 0, sizeof _func);
354-
memcpy(&_func, &obj, sizeof obj);
354+
memcpy(&_func, &method, sizeof method);
355355
_obj = (void*)obj;
356356
_thunk = &local::_thunk;
357357
}
@@ -1000,7 +1000,7 @@ class Callback<R(A0)> {
10001000
};
10011001

10021002
memset(&_func, 0, sizeof _func);
1003-
memcpy(&_func, &obj, sizeof obj);
1003+
memcpy(&_func, &method, sizeof method);
10041004
_obj = (void*)obj;
10051005
_thunk = &local::_thunk;
10061006
}
@@ -1020,7 +1020,7 @@ class Callback<R(A0)> {
10201020
};
10211021

10221022
memset(&_func, 0, sizeof _func);
1023-
memcpy(&_func, &obj, sizeof obj);
1023+
memcpy(&_func, &method, sizeof method);
10241024
_obj = (void*)obj;
10251025
_thunk = &local::_thunk;
10261026
}
@@ -1040,7 +1040,7 @@ class Callback<R(A0)> {
10401040
};
10411041

10421042
memset(&_func, 0, sizeof _func);
1043-
memcpy(&_func, &obj, sizeof obj);
1043+
memcpy(&_func, &method, sizeof method);
10441044
_obj = (void*)obj;
10451045
_thunk = &local::_thunk;
10461046
}
@@ -1060,7 +1060,7 @@ class Callback<R(A0)> {
10601060
};
10611061

10621062
memset(&_func, 0, sizeof _func);
1063-
memcpy(&_func, &obj, sizeof obj);
1063+
memcpy(&_func, &method, sizeof method);
10641064
_obj = (void*)obj;
10651065
_thunk = &local::_thunk;
10661066
}
@@ -1709,7 +1709,7 @@ class Callback<R(A0, A1)> {
17091709
};
17101710

17111711
memset(&_func, 0, sizeof _func);
1712-
memcpy(&_func, &obj, sizeof obj);
1712+
memcpy(&_func, &method, sizeof method);
17131713
_obj = (void*)obj;
17141714
_thunk = &local::_thunk;
17151715
}
@@ -1729,7 +1729,7 @@ class Callback<R(A0, A1)> {
17291729
};
17301730

17311731
memset(&_func, 0, sizeof _func);
1732-
memcpy(&_func, &obj, sizeof obj);
1732+
memcpy(&_func, &method, sizeof method);
17331733
_obj = (void*)obj;
17341734
_thunk = &local::_thunk;
17351735
}
@@ -1749,7 +1749,7 @@ class Callback<R(A0, A1)> {
17491749
};
17501750

17511751
memset(&_func, 0, sizeof _func);
1752-
memcpy(&_func, &obj, sizeof obj);
1752+
memcpy(&_func, &method, sizeof method);
17531753
_obj = (void*)obj;
17541754
_thunk = &local::_thunk;
17551755
}
@@ -1769,7 +1769,7 @@ class Callback<R(A0, A1)> {
17691769
};
17701770

17711771
memset(&_func, 0, sizeof _func);
1772-
memcpy(&_func, &obj, sizeof obj);
1772+
memcpy(&_func, &method, sizeof method);
17731773
_obj = (void*)obj;
17741774
_thunk = &local::_thunk;
17751775
}
@@ -2418,7 +2418,7 @@ class Callback<R(A0, A1, A2)> {
24182418
};
24192419

24202420
memset(&_func, 0, sizeof _func);
2421-
memcpy(&_func, &obj, sizeof obj);
2421+
memcpy(&_func, &method, sizeof method);
24222422
_obj = (void*)obj;
24232423
_thunk = &local::_thunk;
24242424
}
@@ -2438,7 +2438,7 @@ class Callback<R(A0, A1, A2)> {
24382438
};
24392439

24402440
memset(&_func, 0, sizeof _func);
2441-
memcpy(&_func, &obj, sizeof obj);
2441+
memcpy(&_func, &method, sizeof method);
24422442
_obj = (void*)obj;
24432443
_thunk = &local::_thunk;
24442444
}
@@ -2458,7 +2458,7 @@ class Callback<R(A0, A1, A2)> {
24582458
};
24592459

24602460
memset(&_func, 0, sizeof _func);
2461-
memcpy(&_func, &obj, sizeof obj);
2461+
memcpy(&_func, &method, sizeof method);
24622462
_obj = (void*)obj;
24632463
_thunk = &local::_thunk;
24642464
}
@@ -2478,7 +2478,7 @@ class Callback<R(A0, A1, A2)> {
24782478
};
24792479

24802480
memset(&_func, 0, sizeof _func);
2481-
memcpy(&_func, &obj, sizeof obj);
2481+
memcpy(&_func, &method, sizeof method);
24822482
_obj = (void*)obj;
24832483
_thunk = &local::_thunk;
24842484
}
@@ -3127,7 +3127,7 @@ class Callback<R(A0, A1, A2, A3)> {
31273127
};
31283128

31293129
memset(&_func, 0, sizeof _func);
3130-
memcpy(&_func, &obj, sizeof obj);
3130+
memcpy(&_func, &method, sizeof method);
31313131
_obj = (void*)obj;
31323132
_thunk = &local::_thunk;
31333133
}
@@ -3147,7 +3147,7 @@ class Callback<R(A0, A1, A2, A3)> {
31473147
};
31483148

31493149
memset(&_func, 0, sizeof _func);
3150-
memcpy(&_func, &obj, sizeof obj);
3150+
memcpy(&_func, &method, sizeof method);
31513151
_obj = (void*)obj;
31523152
_thunk = &local::_thunk;
31533153
}
@@ -3167,7 +3167,7 @@ class Callback<R(A0, A1, A2, A3)> {
31673167
};
31683168

31693169
memset(&_func, 0, sizeof _func);
3170-
memcpy(&_func, &obj, sizeof obj);
3170+
memcpy(&_func, &method, sizeof method);
31713171
_obj = (void*)obj;
31723172
_thunk = &local::_thunk;
31733173
}
@@ -3187,7 +3187,7 @@ class Callback<R(A0, A1, A2, A3)> {
31873187
};
31883188

31893189
memset(&_func, 0, sizeof _func);
3190-
memcpy(&_func, &obj, sizeof obj);
3190+
memcpy(&_func, &method, sizeof method);
31913191
_obj = (void*)obj;
31923192
_thunk = &local::_thunk;
31933193
}
@@ -3836,7 +3836,7 @@ class Callback<R(A0, A1, A2, A3, A4)> {
38363836
};
38373837

38383838
memset(&_func, 0, sizeof _func);
3839-
memcpy(&_func, &obj, sizeof obj);
3839+
memcpy(&_func, &method, sizeof method);
38403840
_obj = (void*)obj;
38413841
_thunk = &local::_thunk;
38423842
}
@@ -3856,7 +3856,7 @@ class Callback<R(A0, A1, A2, A3, A4)> {
38563856
};
38573857

38583858
memset(&_func, 0, sizeof _func);
3859-
memcpy(&_func, &obj, sizeof obj);
3859+
memcpy(&_func, &method, sizeof method);
38603860
_obj = (void*)obj;
38613861
_thunk = &local::_thunk;
38623862
}
@@ -3876,7 +3876,7 @@ class Callback<R(A0, A1, A2, A3, A4)> {
38763876
};
38773877

38783878
memset(&_func, 0, sizeof _func);
3879-
memcpy(&_func, &obj, sizeof obj);
3879+
memcpy(&_func, &method, sizeof method);
38803880
_obj = (void*)obj;
38813881
_thunk = &local::_thunk;
38823882
}
@@ -3896,7 +3896,7 @@ class Callback<R(A0, A1, A2, A3, A4)> {
38963896
};
38973897

38983898
memset(&_func, 0, sizeof _func);
3899-
memcpy(&_func, &obj, sizeof obj);
3899+
memcpy(&_func, &method, sizeof method);
39003900
_obj = (void*)obj;
39013901
_thunk = &local::_thunk;
39023902
}

0 commit comments

Comments
 (0)