[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-rc1-38-gb156579
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2013-12-11 10:36:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b156579bc3f4014dc00d029bd335c5f06a1da5d0 (commit)
from 1eaf188dc563be4f45110edc1137c5c3758f7f75 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b156579bc3f4014dc00d029bd335c5f06a1da5d0
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Dec 11 11:26:22 2013 +0100
[DEMO] shm demo: fix typo and coding style.
-----------------------------------------------------------------------
Summary of changes:
target/demos/shm/README | 2 +-
target/demos/shm/shmreader.c | 5 +++--
target/demos/shm/shmwriter.c | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/demos/shm/README b/target/demos/shm/README
index ed64d71..7909865 100644
--- a/target/demos/shm/README
+++ b/target/demos/shm/README
@@ -1,4 +1,4 @@
-Two simple C programms to show shared memory programming.
+Two simple C programs to show shared memory programming.
The writer creates a shared memory object called "armadeus-shm".
The shared memory object will be located in /dev/shm.
diff --git a/target/demos/shm/shmreader.c b/target/demos/shm/shmreader.c
index 0a90efa..737a24a 100644
--- a/target/demos/shm/shmreader.c
+++ b/target/demos/shm/shmreader.c
@@ -6,7 +6,8 @@
#include <sys/stat.h>
#include <sys/types.h>
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
char* str = 0;
int shmid = shm_open("/armadeus-shm", O_RDONLY, S_IRWXU);
@@ -16,7 +17,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
- if((str = mmap(0, 1024*1024, PROT_READ, MAP_SHARED, shmid, 0)) == MAP_FAILED) {
+ if ((str = mmap(0, 1024*1024, PROT_READ, MAP_SHARED, shmid, 0)) == MAP_FAILED) {
perror("Cannot map shared memory object");
close(shmid);
diff --git a/target/demos/shm/shmwriter.c b/target/demos/shm/shmwriter.c
index 56202a7..f9e1bea 100644
--- a/target/demos/shm/shmwriter.c
+++ b/target/demos/shm/shmwriter.c
@@ -8,7 +8,8 @@
#include <sys/types.h>
#include <sys/utsname.h>
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
struct utsname sysnames;
char* str = "Hello ! You are on ";
int shmid = shm_open("/armadeus-shm", O_RDWR|O_CREAT|O_TRUNC, S_IRWXU);
hooks/post-receive
--
armadeus
|