aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-06 15:11:00 +0200
committerMicael Karlberg <[email protected]>2011-04-06 15:11:00 +0200
commit4346b5dae76052e8c06b1cda70d561b10c1c486d (patch)
tree8de6b459b429aa24e1bd9738a4fb3b6e07a083a8 /lib/erl_interface
parent3bc0fccb951ffb0909d2824b65d58ad31ad16cc5 (diff)
parentd8dcd70f386de09109ca1f6f817a381cd1387769 (diff)
downloadotp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.gz
otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.bz2
otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.zip
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'lib/erl_interface')
-rw-r--r--lib/erl_interface/src/connect/ei_connect.c2
-rw-r--r--lib/erl_interface/test/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 158c1ec430..34362b4b9f 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1197,7 +1197,7 @@ static char *hex(char digest[16], char buff[33])
char *p = buff;
int i;
- for (i = 0; i < sizeof(digest); ++i) {
+ for (i = 0; i < 16; ++i) {
*p++ = tab[(int)((*d) >> 4)];
*p++ = tab[(int)((*d++) & 0xF)];
}
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index 8ed6834443..4faf89c0d6 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -73,7 +73,7 @@ release_spec:
release_tests_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)
$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
- chmod -f -R u+w $(RELSYSDIR)
+ chmod -R u+w $(RELSYSDIR)
@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
release_docs_spec: