Skip to content

Commit

Permalink
Pointless whitespace tidy.
Browse files Browse the repository at this point in the history
  • Loading branch information
ralight committed Oct 5, 2021
1 parent 7234de7 commit a1a190b
Show file tree
Hide file tree
Showing 159 changed files with 342 additions and 351 deletions.
6 changes: 3 additions & 3 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Broker:
Closes #2207.
- Improve QoS 0 outgoing packet queueing.
- Fix non-reachable bridge blocking the broker on Windows. Closes #2172.
- Fix possible corruption of pollfd array on Windows when bridges were
- Fix possible corruption of pollfd array on Windows when bridges were
reconnecting. Closes #2173.
- Fix QoS 0 messages not being queued when `queue_qos0_messages` was enabled.
Closes #2224.
Expand Down Expand Up @@ -334,7 +334,7 @@ Client library:
Build:
- `install` Makefile target should depend on `all`, not `mosquitto`, to ensure
that man pages are always built. Closes #1989.
- Fixes for lots of minor build warnings highlighted by Visual Studio.
- Fixes for lots of minor build warnings highlighted by Visual Studio.

Apps:
- Disallow control characters in mosquitto_passwd usernames.
Expand Down Expand Up @@ -695,7 +695,7 @@ Broker:
native version. Closes #1684.
- Fix possible assert crash associated with bridge reconnecting when compiled
without epoll support. Closes #1700.

Client library:
- Don't treat an unexpected PUBACK, PUBREL, or PUBCOMP as a fatal error.
Issue #1629.
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ clean :
set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} clean; done
$(MAKE) -C test clean

reallyclean :
reallyclean :
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done
set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} reallyclean; done
$(MAKE) -C test reallyclean
Expand Down Expand Up @@ -107,7 +107,6 @@ uninstall :

dist : reallyclean
set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done

mkdir -p dist/mosquitto-${VERSION}
cp -r ${DISTFILES} dist/mosquitto-${VERSION}/
cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
Expand All @@ -125,7 +124,6 @@ coverage :

localdocker : reallyclean
set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done

rm -rf dockertmp/
mkdir -p dockertmp/mosquitto-${VERSION}
cp -r ${DISTFILES} dockertmp/mosquitto-${VERSION}/
Expand Down
2 changes: 1 addition & 1 deletion THANKS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Dariusz Suchojad
Darren Oliver
David Huang
David Monro
Dirk O. Kaar
Dirk O. Kaar
Dominik Obermaier
Dominik Zajac
Ed Morris
Expand Down
24 changes: 12 additions & 12 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p><em>May 8, 2014</em></p>

<p><em>May 8, 2014</em></p>
<h3>License</h3>

<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 2.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
and a copy of the EDL is available at
<a href="http:https://www.eclipse.org/org/documents/edl-v10.php">http:https://www.eclipse.org/org/documents/edl-v10.php</a>.
A copy of the EPL is available at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>
and a copy of the EDL is available at
<a href="http:https://www.eclipse.org/org/documents/edl-v10.php">http:https://www.eclipse.org/org/documents/edl-v10.php</a>.
For purposes of the EPL, "Program" will mean the Content.</p>

<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party ("Redistributor") and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http:https://www.eclipse.org/">http:https://www.eclipse.org</a>.</p>


<h3>Third Party Content</h3>
<p>The Content includes items that have been sourced from third parties as set out below. If you
did not receive this Content directly from the Eclipse Foundation, the following is provided
for informational purposes only, and you should look to the Redistributor's license for
<p>The Content includes items that have been sourced from third parties as set out below. If you
did not receive this Content directly from the Eclipse Foundation, the following is provided
for informational purposes only, and you should look to the Redistributor's license for
terms and conditions of use.</p>

<h4>libwebsockets 2.4.2</h4>
Expand Down
6 changes: 3 additions & 3 deletions apps/db_dump/db_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2010-2019 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down Expand Up @@ -124,7 +124,7 @@ static int dump__cfg_chunk_process(FILE *db_fd, uint32_t length)
fclose(db_fd);
return rc;
}

if(do_print) printf("DB_CHUNK_CFG:\n");
if(do_print) printf("\tLength: %d\n", length);
if(do_print) printf("\tShutdown: %d\n", chunk.shutdown);
Expand Down
4 changes: 2 additions & 2 deletions apps/db_dump/db_dump.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Copyright (c) 2010-2019 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions apps/db_dump/print.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2010-2019 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
2 changes: 1 addition & 1 deletion apps/mosquitto_ctrl/dynsec.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static void print_default_acl_access(cJSON *j_response)
if(j_acltype == NULL || !cJSON_IsString(j_acltype)
|| j_allow == NULL || !cJSON_IsBool(j_allow)
){

fprintf(stderr, "Error: Invalid response from server.\n");
return;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/mosquitto_ctrl/mosquitto_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
print_usage();
return 1;
}

/* In built modules */
if(!strcasecmp(argv[0], "dynsec")){
l_ctrl_main = dynsec__main;
Expand Down
4 changes: 2 additions & 2 deletions apps/mosquitto_passwd/get_password.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2012-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions apps/mosquitto_passwd/get_password.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Copyright (c) 2012-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
6 changes: 3 additions & 3 deletions apps/mosquitto_passwd/mosquitto_passwd.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2012-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down Expand Up @@ -350,7 +350,7 @@ static int copy_contents(FILE *src, FILE *dest)

rewind(src);
rewind(dest);

#ifdef WIN32
_chsize(fileno(dest), 0);
#else
Expand Down
2 changes: 1 addition & 1 deletion buildtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def run_test(msg, opts):
proc = subprocess.run(args, stdout=subprocess.DEVNULL)
if proc.returncode != 0:
raise RuntimeError("BUILD FAILED: %s" % (' '.join(args)))

def simple_tests():
for bv in build_variants:
for enabled in ["yes", "no"]:
Expand Down
2 changes: 1 addition & 1 deletion client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ uninstall :

reallyclean : clean

clean :
clean :
-rm -f *.o mosquitto_pub mosquitto_sub mosquitto_rr *.gcda *.gcno
5 changes: 2 additions & 3 deletions client/client_props.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2018-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down Expand Up @@ -109,7 +109,6 @@ int cfg_parse_property(struct mosq_config *cfg, int argc, char *argv[], int *idx
(*idx) += 2;
}


switch(cmd){
case CMD_CONNECT:
proplist = &cfg->connect_props;
Expand Down
6 changes: 3 additions & 3 deletions client/client_shared.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2014-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down Expand Up @@ -992,7 +992,7 @@ int client_config_line_proc(struct mosq_config *cfg, int pub_or_sub, int argc, c
if(cfg->pub_mode != MSGMODE_NONE){
fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
return 1;
}else{
}else{
cfg->pub_mode = MSGMODE_STDIN_FILE;
}
#ifdef WITH_SRV
Expand Down
4 changes: 2 additions & 2 deletions client/client_shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2014-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions client/pub_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions client/pub_shared.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions client/pub_shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions client/rr_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
4 changes: 2 additions & 2 deletions client/sub_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light <[email protected]>
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
and Eclipse Distribution License v1.0 which accompany this distribution.
The Eclipse Public License is available at
https://www.eclipse.org/legal/epl-2.0/
and the Eclipse Distribution License is available at
http:https://www.eclipse.org/org/documents/edl-v10.php.
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
Contributors:
Expand Down
Loading

0 comments on commit a1a190b

Please sign in to comment.