DistRen Changeset - d6e9f76622f2 · protofusion repositories

Changeset - d6e9f76622f2

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca - 16 years ago 2009-08-01 00:00:22

Warning-squashing

2 files changed with 4 insertions and 4 deletions:

src/server/distrend.c

src/server/slavefuncs.c

0 comments (0 inline, 0 general)

src/server/distrend.c

➞

Show inline comments

@@ @@ -111,25 +111,25 @@ struct blendjob *blendjob_get(struct ble @@
 /* Global Vars, try to cut down on these */
 jobnum_t jobnum = 0; // The next job number to create in the queue
 int hcfjob; // Highest consecutively finished job
 int highest_jobnum; // The job number of the most recently created job, this is used when creating new jobs
 /* ********************** Functions ************************* */
 /* Functions to stubify */
 /** Command interface for distren? */
 int distrend_do(){
+	return 0;
+}
 /** Something? */
 void distrend_accept(){
+}
 /** Frees the action */
 void distrend_action_free(){
+}
 /** Start listening */
 void distrend_listen(){

src/server/slavefuncs.c

➞

Show inline comments

@@ @@ -100,25 +100,25 @@ int register_user(char *username, char * @@
       "newuser",
       "-M",
       "-c",
       email,
       "-d",
       "/home/distren",
       "--gid",
       "541",
       username,
       (char *)NULL
     };
   size_t readlen;
-  fprintf(stderr, "Opening stream:\n", execio_open(&testrem, "ssh", execargv));
+  execio_open(&testrem, "ssh", execargv); // TODO: Grab returns from this someday.
   buf[9] = '\0'; // null-terminating the array...
   while(!execio_read(testrem, buf, 9, &readlen))
+    {
       if(readlen > 9) {
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
       buf[readlen] = '\0';
       fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   /* @TODO: Parse the output buffer or something to check when user creation fails due to duplicate users. This is pretty important. */
@@ @@ -176,25 +176,25 @@ int login_user(char *username) @@
       return 44;
+    }
   strcpy(userkey, username);
   strcat(userkey,".rsa");
   fprintf(stderr, "Logging you in to %s using key %s\n", userhost, userkey);
   if(fopen(userkey, "r") == NULL){
 	  fprintf(stderr,"Your key, %s, has not been found! Re-register or somehow regenerate your key! We need a way to regenerate keys coded in, but we don't have the facilities yet!",userkey);
 	  return 0;
+  }
-  fprintf(stderr, "Opening stream:\n", execio_open(&testrem, "ssh", execargv));
+  execio_open(&testrem, "ssh", execargv); // TODO: Grab returns from this someday
   buf[9] = '\0'; // null-terminating the array...
   while(!execio_read(testrem, buf, 9, &readlen))
+    {
       if(readlen > 9) {
 	fprintf(stderr, "!!!! Something is terribly wrong!\n");
+      }
     buf[readlen] = '\0';
     fprintf(stderr, "read \"%s\"\n", buf);
+    }
   execio_close(testrem);
   return 1; // 1 can be like... error-free login...
+}
@@ @@ -226,30 +226,30 @@ int conf_replace(char *username){ @@
+      {
           buff_ptr = buffer;
           while ((find_ptr = strstr(buff_ptr,text2find)))
+          {
           while(buff_ptr < find_ptr)
           	fputc((int)*buff_ptr++,fp2);
           fputs(text2repl,fp2);
           buff_ptr += find_len;
+          }
           fputs(buff_ptr,fp2);
+      }
     rename(fileRepl, fileOrig);
     return 1;
+  }
   fclose(fp2);
   fclose(fp1);
   fprintf(stderr,"Wrote conf file...\n");
 return 1;
+}
 /* Executors */
 /*
   It seems that the client will need to know the job number. fixme.
 */
 /** Executor function for Blender operations */
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame)
+{

0 comments (0 inline, 0 general)