Squeeze extra blank lines with cat(1).

Example: find . -type f -iname '*.c' | while read -r i; do cat -s "$i" > "$i.new" mv "$i.new" "$i" done
retrorepair · Jan 8, 2019 · bfc366d · bfc366d
1 parent 93346fe
commit bfc366d
Show file tree

Hide file tree

Showing 601 changed files with 0 additions and 5,481 deletions.
diff --git a/Makefile.ctr b/Makefile.ctr
@@ -107,7 +107,6 @@ MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARG
 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib
 
-
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
 
 CFLAGS	+=	-mword-relocations \
@@ -151,7 +150,6 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
 CFLAGS   += -std=gnu99 -ffast-math
 
-
 LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
 
 ifeq ($(DEBUG), 1)
@@ -160,7 +158,6 @@ else
 	LIBS	+= -lctru
 endif
 
-
 ifeq ($(BUILD_3DSX), 1)
 	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -270,7 +267,6 @@ $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 $(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
 
-
 clean:
 	rm -f $(OBJ)
 	rm -f $(TARGET).3dsx
@@ -285,4 +281,3 @@ clean:
 
 .PHONY: clean
 
-
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
@@ -94,10 +94,8 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
 CFLAGS   += -std=gnu99 -ffast-math
 
-
 LIBS	:= -lctru -lm
 
-
 ifeq ($(BUILD_3DSX), 1)
 TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -221,4 +219,3 @@ clean:
 
 .PHONY: clean
 
-
diff --git a/Makefile.griffin b/Makefile.griffin
@@ -1074,7 +1074,6 @@ overlays-checkout:
       $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
    fi
 
-
 clean:
 	rm -f $(EXT_TARGET)
 	rm -f $(EXT_INTER_TARGET)

diff --git a/Makefile.libogc b/Makefile.libogc
@@ -45,7 +45,6 @@ export CXX	:=	$(PREFIX)g++
 export AR	:=	$(PREFIX)ar
 export OBJCOPY	:=	$(PREFIX)objcopy
 
-
 ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
 
 #---------------------------------------------------------------------------------
@@ -131,7 +130,6 @@ INCLUDES	:=	$(DEFINCS) \
 
 MACHDEP		:= -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
 
-
 ifeq ($(PLATFORM),wii)
 MACHDEP		+=	-DHW_RVL
 endif
@@ -159,7 +157,6 @@ VPATH :=	$(LWIPDIR)				\
 			$(LIBWIIKEYB)		\
 			$(STUBSDIR)
 
-
 #---------------------------------------------------------------------------------
 SOURCES_LWIP := $(LWIPDIR)/network.c \
 					 $(LWIPDIR)/netio.c \
@@ -264,7 +261,6 @@ SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
 						 $(OGCDIR)/system_asm.S \
 						 $(OGCDIR)/video_asm.S
 
-
 ifneq ($(BUILD_LITE), 1)
 SOURCES_OGC += $(OGCDIR)/dvd.c
 endif

diff --git a/Makefile.orbis b/Makefile.orbis
@@ -65,7 +65,6 @@ else
 	#OBJ += frontend/drivers/platform_orbis.o
 endif
 
-
 ifeq ($(strip $(PS4SDK)),)
 $(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
 endif
@@ -124,15 +123,13 @@ CXXFLAGS := $(CFLAGS)
 PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
 	-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
 
-
 LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS) 
 
 TARGETS := $(TARGET).elf
 
 DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
 POSTCOMPILE = mv -f $*.Tdepend $*.depend
 
-
 all: $(TARGETS)
 
 %.o: %.cpp
@@ -145,7 +142,6 @@ all: $(TARGETS)
 	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
 	$(POSTCOMPILE)
 
-
 %.o: %.S
 %.o: %.S %.depend
 	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)

diff --git a/Makefile.ps2 b/Makefile.ps2
@@ -27,7 +27,6 @@ ifeq ($(MUTE_WARNINGS), 1)
    DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
 endif
 
-
 INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
 INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
 INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper

diff --git a/Makefile.psp1 b/Makefile.psp1
@@ -49,7 +49,6 @@ endif
 
 CFLAGS += $(RARCH_DEFINES)
 
-
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1
 

diff --git a/Makefile.vita b/Makefile.vita
@@ -127,7 +127,6 @@ TARGETS := $(TARGET).vpk
 DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
 POSTCOMPILE = mv -f $*.Tdepend $*.depend
 
-
 all: $(TARGETS)
 
 %.o: %.cpp
@@ -140,7 +139,6 @@ all: $(TARGETS)
 	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
 	$(POSTCOMPILE)
 
-
 %.o: %.S
 %.o: %.S %.depend
 	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)

diff --git a/Makefile.wiiu b/Makefile.wiiu
@@ -242,7 +242,6 @@ ifneq ($(WANT_IOSUHAX), 1)
 LIBS += -liosuhax
 endif
 
-
 RPX_OBJ           = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
 HBL_ELF_OBJ       = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o
 
@@ -264,13 +263,11 @@ endif
 
 DEPFLAGS    = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend
 
-
 all: $(TARGETS)
 
 %: $(BUILD_DIR)/%
 	cp $< $@
 
-
 $(BUILD_DIR)/%.o: %.cpp %.depend
 	@$(if $(Q), echo CXX $<,)
 	@mkdir -p $(dir $@)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
@@ -397,7 +397,6 @@ static void audio_driver_mixer_init(unsigned out_rate)
    audio_mixer_init(out_rate);
 }
 
-
 static bool audio_driver_init_internal(bool audio_cb_inited)
 {
    unsigned new_rate     = 0;
@@ -636,7 +635,6 @@ static void audio_driver_flush(const int16_t *data, size_t samples)
    src_data.data_in                  = audio_driver_input_data;
    src_data.input_frames             = samples >> 1;
 
-
    if (audio_driver_dsp)
    {
       struct retro_dsp_data dsp_data;
@@ -1504,7 +1502,6 @@ bool audio_driver_start(bool is_shutdown)
    return false;
 }
 
-
 bool audio_driver_stop(void)
 {
    if (!current_audio || !current_audio->stop
@@ -1594,7 +1591,6 @@ void audio_set_bool(enum audio_action action, bool val)
    }
 }
 
-
 void audio_set_float(enum audio_action action, float val)
 {
    switch (action)

diff --git a/audio/drivers/alsa_qsa.c b/audio/drivers/alsa_qsa.c
@@ -219,7 +219,6 @@ static int check_pcm_status(void *data, int channel_type)
    return ret;
 }
 
-
 static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
 {
    alsa_t              *alsa = (alsa_t*)data;
@@ -328,7 +327,6 @@ static void alsa_qsa_set_nonblock_state(void *data, bool state)
    alsa->nonblock = state;
 }
 
-
 static bool alsa_qsa_use_float(void *data)
 {
    alsa_t *alsa = (alsa_t*)data;

diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c
@@ -15,7 +15,6 @@
  */
 #include <stdlib.h>
 
-
 #if TARGET_OS_IPHONE
 #include <AudioToolbox/AudioToolbox.h>
 #else

diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c
@@ -56,7 +56,6 @@ static void ctr_csnd_audio_update_playpos(ctr_csnd_audio_t* ctr)
    ctr->cpu_ticks_last += samples_played * CTR_CSND_CPU_TICKS_PER_SAMPLE;
 }
 
-
 Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,
       void* data0, void* data1, u32 size)
 {
@@ -289,7 +288,6 @@ static size_t ctr_csnd_audio_buffer_size(void *data)
    return CTR_CSND_AUDIO_COUNT;
 }
 
-
 audio_driver_t audio_ctr_csnd = {
    ctr_csnd_audio_init,
    ctr_csnd_audio_write,

diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c
@@ -195,7 +195,6 @@ static size_t ctr_dsp_audio_buffer_size(void *data)
    return CTR_DSP_AUDIO_COUNT;
 }
 
-
 audio_driver_t audio_ctr_dsp = {
    ctr_dsp_audio_init,
    ctr_dsp_audio_write,

diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c
@@ -51,7 +51,6 @@
 #pragma comment(lib, "dxguid")
 #endif
 
-
 typedef struct dsound
 {
    LPDIRECTSOUND ds;
@@ -174,7 +173,6 @@ static DWORD CALLBACK dsound_thread(PVOID data)
          /* No space to write, or we don't have data in our fifo,
           * but we can wait some time before it underruns ... */
 
-
          /* We could opt for using the notification interface,
           * but it is not guaranteed to work, so use high
           * priority sleeping patterns.

diff --git a/audio/drivers/opensl.c b/audio/drivers/opensl.c
@@ -232,7 +232,6 @@ static bool sl_start(void *data, bool is_shutdown)
    return sl->is_paused ? false : true;
 }
 
-
 static ssize_t sl_write(void *data, const void *buf_, size_t size)
 {
    sl_t           *sl = (sl_t*)data;

diff --git a/audio/drivers/ps2_audio.c b/audio/drivers/ps2_audio.c
@@ -43,7 +43,6 @@ static u8 audioThreadStack[4 * 1024] __attribute__ ((aligned(16)));
 #define AUDIO_BITS 16
 #define AUDIO_PRIORITY 0x7F /* LOWER VALUE GRATHER PRIORITY*/
 
-
 static void audioMainLoop(void *data)
 {
    char out_tmp[AUDIO_OUT_BUFFER];
@@ -67,7 +66,6 @@ static void audioMainLoop(void *data)
    ExitDeleteThread();
 }
 
-
 static void audioCreateThread(ps2_audio_t *ps2)
 {
    int ret;

diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c
@@ -228,7 +228,6 @@ static bool psp_audio_alive(void *data)
    return psp->running;
 }
 
-
 static bool psp_audio_stop(void *data)
 {
    psp_audio_t* psp = (psp_audio_t*)data;
@@ -294,7 +293,6 @@ static size_t psp_buffer_size(void *data)
    return AUDIO_BUFFER_SIZE /** sizeof(uint32_t)*/;
 }
 
-
 audio_driver_t audio_psp = {
    psp_audio_init,
    psp_audio_write,

diff --git a/audio/drivers/switch_thread_audio.c b/audio/drivers/switch_thread_audio.c
@@ -80,7 +80,6 @@ static void mainLoop(void* data)
 
    RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);
 
-
    while (swa->running)
    {
       size_t buf_avail, avail, to_write;

diff --git a/audio/drivers/tinyalsa.c b/audio/drivers/tinyalsa.c
@@ -296,7 +296,6 @@
 #define SNDRV_PCM_MMAP_OFFSET_STATUS   0x80000000
 #define SNDRV_PCM_MMAP_OFFSET_CONTROL  0x81000000
 
-
 /** Audio sample format of a PCM.
  * The first letter specifiers whether the sample is signed or unsigned.
  * The letter 'S' means signed. The letter 'U' means unsigned.

diff --git a/audio/drivers/wiiu_audio.c b/audio/drivers/wiiu_audio.c
@@ -318,7 +318,6 @@ static size_t ax_audio_buffer_size(void* data)
    return AX_AUDIO_COUNT;
 }
 
-
 audio_driver_t audio_ax =
 {
    ax_audio_init,

diff --git a/audio/drivers/xaudio27.h b/audio/drivers/xaudio27.h
@@ -169,7 +169,6 @@ typedef OPAQUE IXAudio2EngineCallback IXAudio2EngineCallback;
 typedef OPAQUE IXAudio2SubmixVoice IXAudio2SubmixVoice;
 #endif
 
-
 typedef struct XAUDIO2_BUFFER
 {
    UINT32 Flags;

diff --git a/audio/drivers_resampler/cc_resampler.c b/audio/drivers_resampler/cc_resampler.c
@@ -55,7 +55,6 @@ typedef struct rarch_CC_resampler
    void (*process)(void *re, struct resampler_data *data);
 } rarch_CC_resampler_t;
 
-
 #ifdef _MIPS_ARCH_ALLEGREX
 static void resampler_CC_process(void *re_, struct resampler_data *data)
 {
@@ -115,7 +114,6 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)
 
                "vadd.q  c720, c720, c620           \n"
 
-
                "vadd.s  s730, s730, s730[1]  \n"
                "mfv     %0,   s730           \n"
 
@@ -216,7 +214,6 @@ static void resampler_CC_downsample(void *re_, struct resampler_data *data)
       vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
       vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);
 
-
       vec_ww1 = _mm_mul_ps(vec_ww1, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
       vec_ww2 = _mm_mul_ps(vec_ww2, _mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));
 
@@ -307,7 +304,6 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
          vec_ww1 = _mm_mul_ps(vec_w1, vec_w1);
          vec_ww2 = _mm_mul_ps(vec_w2, vec_w2);
 
-
          vec_ww1 = _mm_mul_ps(vec_ww1,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww1));
          vec_ww2 = _mm_mul_ps(vec_ww2,_mm_sub_ps(_mm_set_ps1(3.0),vec_ww2));
 
@@ -349,7 +345,6 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
    data->output_frames = outp - (audio_frame_float_t*)data->data_out;
 }
 
-
 #elif defined (__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
 
 #define CC_RESAMPLER_IDENT "NEON"
@@ -492,7 +487,6 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)
       re->process(re_, data);
 }
 
-
 static void *resampler_CC_init(const struct resampler_config *config,
       double bandwidth_mod, 
       enum resampler_quality quality,
-Original file line number
+Diff line change
@@ Expand Up / @@ -1074,7 +1074,6 @@ overlays-checkout: @@
           $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
        fi
     clean:
     	rm -f $(EXT_TARGET)
     	rm -f $(EXT_INTER_TARGET)
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,6 @@ endif

		CFLAGS += $(RARCH_DEFINES)


		EXTRA_TARGETS = EBOOT.PBP
		PSP_EBOOT_TITLE = RetroArch PSP1

Expand Down