Skip to content

Use BreakBeforeBraces: Linux for clang-format #8212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
homm wants to merge 1 commit into from
Closed

Use BreakBeforeBraces: Linux for clang-format #8212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AllowShortIfStatementsOnASingleLine: false
AlignAfterOpenBracket: AlwaysBreak
BinPackArguments: false
BinPackParameters: false
BreakBeforeBraces: Attach
BreakBeforeBraces: Linux
ColumnLimit: 88
DerivePointerAlignment: false
IndentGotoLabels: false
Expand Down
33 changes: 22 additions & 11 deletions src/Tk/tkImaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ static Tk_PhotoGetImage_t TK_PHOTO_GET_IMAGE;
static Tk_PhotoPutBlock_t TK_PHOTO_PUT_BLOCK;

static Imaging
ImagingFind(const char *name) {
ImagingFind(const char *name)
{
Py_ssize_t id;

/* FIXME: use CObject instead? */
Expand All @@ -73,7 +74,8 @@ ImagingFind(const char *name) {

static int
PyImagingPhotoPut(
ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv) {
ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv)
{
Imaging im;
Tk_PhotoHandle photo;
Tk_PhotoImageBlock block;
Expand Down Expand Up @@ -135,7 +137,8 @@ PyImagingPhotoPut(

static int
PyImagingPhotoGet(
ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv) {
ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv)
{
Imaging im;
Tk_PhotoHandle photo;
Tk_PhotoImageBlock block;
Expand Down Expand Up @@ -177,7 +180,8 @@ PyImagingPhotoGet(
}

void
TkImaging_Init(Tcl_Interp *interp) {
TkImaging_Init(Tcl_Interp *interp)
{
TCL_CREATE_COMMAND(
interp,
"PyImagingPhoto",
Expand Down Expand Up @@ -215,7 +219,8 @@ TkImaging_Init(Tcl_Interp *interp) {
#define TKINTER_PKG "tkinter"

FARPROC
_dfunc(HMODULE lib_handle, const char *func_name) {
_dfunc(HMODULE lib_handle, const char *func_name)
{
/*
* Load function `func_name` from `lib_handle`.
* Set Python exception if we can't find `func_name` in `lib_handle`.
Expand All @@ -233,7 +238,8 @@ _dfunc(HMODULE lib_handle, const char *func_name) {
}

int
get_tcl(HMODULE hMod) {
get_tcl(HMODULE hMod)
{
/*
* Try to fill Tcl global vars with function pointers. Return 0 for no
* functions found, 1 for all functions found, -1 for some but not all
Expand All @@ -251,7 +257,8 @@ get_tcl(HMODULE hMod) {
}

int
get_tk(HMODULE hMod) {
get_tk(HMODULE hMod)
{
/*
* Try to fill Tk global vars with function pointers. Return 0 for no
* functions found, 1 for all functions found, -1 for some but not all
Expand All @@ -274,7 +281,8 @@ get_tk(HMODULE hMod) {
}

int
load_tkinter_funcs(void) {
load_tkinter_funcs(void)
{
/*
* Load Tcl and Tk functions by searching all modules in current process.
* Return 0 for success, non-zero for failure.
Expand Down Expand Up @@ -352,7 +360,8 @@ load_tkinter_funcs(void) {
#include <dlfcn.h>

void *
_dfunc(void *lib_handle, const char *func_name) {
_dfunc(void *lib_handle, const char *func_name)
{
/*
* Load function `func_name` from `lib_handle`.
* Set Python exception if we can't find `func_name` in `lib_handle`.
Expand All @@ -371,7 +380,8 @@ _dfunc(void *lib_handle, const char *func_name) {
}

int
_func_loader(void *lib) {
_func_loader(void *lib)
{
/*
* Fill global function pointers from dynamic lib.
* Return 1 if any pointer is NULL, 0 otherwise.
Expand All @@ -398,7 +408,8 @@ _func_loader(void *lib) {
}

int
load_tkinter_funcs(void) {
load_tkinter_funcs(void)
{
/*
* Load tkinter global funcs from tkinter compiled module.
* Return 0 for success, non-zero for failure.
Expand Down
Loading