diff --git a/checkin_notes b/checkin_notes
index 63e1b1a77e..21409da5f7 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -16520,3 +16520,13 @@ David 20 Aug 2004
ops/
show_log.php
white.css (new)
+
+David 20 Aug 2004
+ - removed perror()s from shmem functions.
+ Shouldn't do I/O at this level.
+
+ html/user/
+ info.php
+ stats.php
+ lib/
+ shmem.C
diff --git a/html/user/info.php b/html/user/info.php
index 0b0cdb29ad..984f713545 100644
--- a/html/user/info.php
+++ b/html/user/info.php
@@ -1,7 +1,5 @@
The work done by your computer contributes to the
-academic nonprofit research being performed by ", PROJECT, ",
+goals of ", PROJECT, ",
as described on its web site.
The application programs may change from time to time.
@@ -60,21 +58,26 @@ however, you can choose not to be sent these at any time.
Is it safe to run ", PROJECT, " ?
-Any time you download a program through the Internet you are taking a chance: the program might have dangerous errors, or the download server might have been hacked.
+Any time you download a program through the Internet you are taking a chance:
+the program might have dangerous errors,
+or the download server might have been hacked.
", PROJECT, " has made efforts to minimize these risks.
We have tested our applications carefully.
Our servers are behind a firewall and are configured for high security.
-To ensure the safety of program downloads, all executable files are digitally signed on a secure computer not connected to the Internet.
+To ensure the safety of program downloads,
+all executable files are digitally signed on a secure computer
+not connected to the Internet.
-", PROJECT, " was developed at the University of California at Berkeley.
+", PROJECT, " was developed at ".COPYRIGHT_HOLDER.".
+BOINC was developed at the University of California.
Liability
-", PROJECT, " and the University of California
+", PROJECT, " and ".COPYRIGHT_HOLDER."
assume no liability for damage to your computer,
loss of data, or any other event or condition that may occur
as a result of participating in ", PROJECT, ".
diff --git a/html/user/stats.php b/html/user/stats.php
index baa5c4e173..e7a0d0ef1d 100644
--- a/html/user/stats.php
+++ b/html/user/stats.php
@@ -1,7 +1,5 @@
+HispaSeti & BOINC (Spanish-language)
+
BOINC Statistics for the WORLD!
http://www.boinc.dk,
diff --git a/lib/shmem.C b/lib/shmem.C
index f30973bcfe..7f75aef489 100755
--- a/lib/shmem.C
+++ b/lib/shmem.C
@@ -94,12 +94,9 @@ int detach_shmem(HANDLE hSharedMem, void* p) {
int create_shmem(key_t key, int size, void** pp) {
int id;
- char buf[256];
assert(pp!=NULL);
id = shmget(key, size, IPC_CREAT|0777);
if (id < 0) {
- sprintf(buf, "create_shmem: shmget: key: %x size: %d", (unsigned int)key, size);
- perror(buf);
return ERR_SHMGET;
}
return attach_shmem(key, pp);
@@ -114,15 +111,8 @@ int destroy_shmem(key_t key){
if (id < 0) return 0; // assume it doesn't exist
retval = shmctl(id, IPC_STAT, &buf);
if (retval) return ERR_SHMCTL;
- if (buf.shm_nattch > 0) {
- fprintf(stderr,
- "destroy_shmem: %d attachments\n",
- (int)buf.shm_nattch
- );
- }
retval = shmctl(id, IPC_RMID, 0);
if (retval) {
- fprintf(stderr, "destroy_shmem: remove failed %d\n", retval);
return ERR_SHMCTL;
}
return 0;
@@ -130,19 +120,14 @@ int destroy_shmem(key_t key){
int attach_shmem(key_t key, void** pp){
void* p;
- char buf[256];
int id;
assert(pp!=NULL);
id = shmget(key, 0, 0);
if (id < 0) {
- sprintf(buf, "attach_shmem: shmget: key: %x mem_addr: %p", (unsigned int)key, (void*)pp);
- perror(buf);
return ERR_SHMGET;
}
p = shmat(id, 0, 0);
if ((long)p == ERR_SHMAT) {
- sprintf(buf, "attach_shmem: shmat: key: %x mem_addr: %p", (unsigned int)key, (void*)pp);
- perror(buf);
return ERR_SHMAT;
}
*pp = p;
@@ -153,24 +138,22 @@ int detach_shmem(void* p) {
int retval;
assert(p!=NULL);
retval = shmdt((char *)p);
- if (retval) perror("detach_shmem: shmdt");
return retval;
}
-int shmem_info(key_t key) {
+int print_shmem_info(key_t key) {
int id;
struct shmid_ds buf;
- char buf2[256];
id = shmget(key, 0, 0);
if (id < 0) {
- sprintf(buf2, "shmem_info: shmget: key: %x", (unsigned int)key);
- perror(buf2);
return ERR_SHMGET;
}
shmctl(id, IPC_STAT, &buf);
- fprintf( stderr, "shmem key: %x\t\tid: %d, size: %d, nattach: %d\n",
- (unsigned int)key, id, buf.shm_segsz, (int)buf.shm_nattch );
+ fprintf(
+ stderr, "shmem key: %x\t\tid: %d, size: %d, nattach: %d\n",
+ (unsigned int)key, id, buf.shm_segsz, (int)buf.shm_nattch
+ );
return 0;
}